Skip to content

Remove MovementCache #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kalibrieren wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Remove MovementCache #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95ac5a5
Delete WindSpigot-Server/src/main/java/me/suicidalkids/ion/movement/M…
kalibrieren Jul 29, 2026
b051496
Update WorldTicker.java
kalibrieren Jul 29, 2026
ee70b24
Update Entity.java
kalibrieren Jul 29, 2026
21a3614
Update PlayerConnection.java
kalibrieren Jul 29, 2026
0d52248
Update World.java
kalibrieren Jul 29, 2026
de10f1a
Update README.md
kalibrieren Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ See the patches list below.

[IonSpigot-0003] Explosion Improvements
[IonSpigot-0006] Fix Chunk Loading
[IonSpigot-0012] Movement Cache
[IonSpigot-0013] Implement PandaWire
[IonSpigot-0014] Faster Chunk Entity List
[IonSpigot-0020] Faster EntityTracker Collections
Expand Down
1 change: 0 additions & 1 deletion WindSpigot-Server/src/main/java/com/windpvp/windspigot/world/WorldTicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ public void run() {
// this.methodProfiler.b();
// this.methodProfiler.b();
worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
worldserver.movementCache.clear(); // IonSpigot - Movement Cache
}

public ResettableLatch getLatch() {
Expand Down
51 changes: 0 additions & 51 deletions WindSpigot-Server/src/main/java/me/suicidalkids/ion/movement/MovementCache.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions WindSpigot-Server/src/main/java/net/minecraft/server/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
public double motX;
public double motY;
public double motZ;
// IonSpigot start - Movement Cache
public double lastMotX;
public double lastMotY;
public double lastMotZ;
// IonSpigot end
public float yaw;
public float pitch;
public float lastYaw;
Expand Down Expand Up @@ -538,16 +533,6 @@ public void move(double d0, double d1, double d2) {
return;
}

// IonSpigot start - Movement Cache
this.lastMotX = this.motX;
this.lastMotY = this.motY;
this.lastMotZ = this.motZ;

if (world.movementCache.move(this)) {
return;
}
// IonSpigot end

// CraftBukkit start - Don't do anything if we aren't moving
// We need to do this regardless of whether or not we are moving thanks to
// portals
Expand Down Expand Up @@ -847,7 +832,6 @@ public void move(double d0, double d1, double d2) {
if (d7 != d1) {
block.a(this.world, this);
}
world.movementCache.cache(this); // IonSpigot - Movement Cache

// CraftBukkit start
if (positionChanged && getBukkitEntity() instanceof Vehicle) {
Expand Down
1 change: 0 additions & 1 deletion WindSpigot-Server/src/main/java/net/minecraft/server/PlayerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,6 @@ public void a(PacketPlayInFlying packetplayinflying) {
this.player.bF();
}

this.player.world.movementCache.clear(); // IonSpigot - Movement Cache
this.player.move(d11, d12, d13);
this.player.onGround = packetplayinflying.f();
double d16 = d12;
Expand Down
4 changes: 0 additions & 4 deletions WindSpigot-Server/src/main/java/net/minecraft/server/World.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import me.elier.nachospigot.config.NachoWorldConfig;
import me.rastrian.dev.PlayerMap;
import me.suicidalkids.ion.movement.MovementCache;
// WindSpigot end

public abstract class World implements IBlockAccess {
Expand Down Expand Up @@ -172,8 +171,6 @@ public boolean add(BlockState blockState) {
public java.util.ArrayDeque<BlockRedstoneTorch.RedstoneUpdateInfo> redstoneUpdateInfos; // Paper - Move from Map in
// BlockRedstoneTorch to
// here

public final MovementCache movementCache = new MovementCache(); // IonSpigot - Movement Cache

public static long chunkToKey(int x, int z) {
long k = (((x) & 0xFFFF0000L) << 16) | (((x) & 0x0000FFFFL));
Expand Down Expand Up @@ -535,7 +532,6 @@ public boolean setTypeAndData(BlockPosition blockposition, IBlockData iblockdata
this.methodProfiler.b();
}

movementCache.clear(); // IonSpigot - Movement Cache
/*
* if ((i & 2) != 0 && (!this.isClientSide || (i & 4) == 0) && chunk.isReady())
* { this.notify(blockposition); }
Expand Down
Loading