From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Fri, 24 Mar 2023 16:29:21 +0000 Subject: [PATCH] Reduce deltaMovement Allocations diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 038ee401a003cbf0f96eee1f60fbb13bb6622b5b..8363fb274fafb06253272bc5706c8d209856e7ab 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1166,8 +1166,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.tryCheckInsideBlocks(); float f2 = this.getBlockSpeedFactor(); - - this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2)); + this.multiplyDeltaMovement((double) f2, 1.0D, (double) f2); // Sakura - reduce movement allocations // Paper start - remove expensive streams from here boolean noneMatch = true; AABB fireSearchBox = this.getBoundingBox().deflate(1.0E-6D); @@ -1900,6 +1899,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void moveTo(double x, double y, double z, float yaw, float pitch) { // Paper - cancel entity velocity if teleported if (!preserveMotion) { + this.movementDirty = false; // Sakura this.deltaMovement = Vec3.ZERO; } else { this.preserveMotion = false; @@ -3218,29 +3218,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void onAboveBubbleCol(boolean drag) { - Vec3 vec3d = this.getDeltaMovement(); + // Sakura start - reduce movement allocations + // Vec3 vec3d = this.getDeltaMovement(); + this.syncDeltaMovement(); double d0; if (drag) { - d0 = Math.max(-0.9D, vec3d.y - 0.03D); + d0 = Math.max(-0.9D, movementY - 0.03D); } else { - d0 = Math.min(1.8D, vec3d.y + 0.1D); + d0 = Math.min(1.8D, movementY + 0.1D); } - this.setDeltaMovement(vec3d.x, d0, vec3d.z); + this.setDeltaMovement(movementX, d0, movementZ); } public void onInsideBubbleColumn(boolean drag) { - Vec3 vec3d = this.getDeltaMovement(); + // Vec3 vec3d = this.getDeltaMovement(); + this.syncDeltaMovement(); double d0; if (drag) { - d0 = Math.max(-0.3D, vec3d.y - 0.03D); + d0 = Math.max(-0.3D, movementY - 0.03D); } else { - d0 = Math.min(0.7D, vec3d.y + 0.06D); + d0 = Math.min(0.7D, movementY + 0.06D); } - this.setDeltaMovement(vec3d.x, d0, vec3d.z); + this.setDeltaMovement(movementX, d0, movementZ); + // Sakura end this.resetFallDistance(); } @@ -4225,16 +4229,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { vec3d = vec3d.normalize(); } - Vec3 vec3d2 = this.getDeltaMovement(); + // Sakura start - reduce movement allocations + // Vec3 vec3d2 = this.getDeltaMovement(); + this.syncDeltaMovement(); vec3d = vec3d.scale(speed * 1.0D); double d3 = 0.003D; - if (Math.abs(vec3d2.x) < 0.003D && Math.abs(vec3d2.z) < 0.003D && vec3d.length() < 0.0045000000000000005D) { + if (Math.abs(movementX) < 0.003D && Math.abs(movementZ) < 0.003D && vec3d.length() < 0.0045000000000000005D) { vec3d = vec3d.normalize().scale(0.0045000000000000005D); } - this.setDeltaMovement(this.getDeltaMovement().add(vec3d)); + this.addDeltaMovement(vec3d.x, vec3d.y, vec3d.z); + // Sakura end } this.fluidHeight.put(tag, d1); @@ -4301,11 +4308,53 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.chunkPosition; } + // Sakura start - reduce movement allocations + private double movementX; + private double movementY; + private double movementZ; + private boolean movementDirty; + + public void addDeltaMovement(double x, double y, double z) { + syncDeltaMovement(); + movementX += x; + movementY += y; + movementZ += z; + } + + public void scaleDeltaMovement(double n) { + syncDeltaMovement(); + movementX *= n; + movementY *= n; + movementZ *= n; + } + + public void multiplyDeltaMovement(double x, double y, double z) { + syncDeltaMovement(); + movementX *= x; + movementY *= y; + movementZ *= z; + } + + private void updateDeltaMovement() { + if (movementDirty) { + deltaMovement = new Vec3(movementX, movementY, movementZ); + movementDirty = false; + } + } + + private void syncDeltaMovement() { + if (!movementDirty) { + setDeltaMovement(deltaMovement.x, deltaMovement.y, deltaMovement.z); + } + } + public Vec3 getDeltaMovement() { + updateDeltaMovement(); return this.deltaMovement; } public void setDeltaMovement(Vec3 velocity) { + movementDirty = false; synchronized (this.posLock) { // Paper this.deltaMovement = velocity; } // Paper @@ -4316,7 +4365,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void setDeltaMovement(double x, double y, double z) { - this.setDeltaMovement(new Vec3(x, y, z)); + movementX = x; + movementY = y; + movementZ = z; + movementDirty = true; + // Sakura end } public final int getBlockX() { diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java index c7bf257a4c5a36c1a6b54fe23701d7169da13100..2c1b7fae5f2ebbcb6ec77db9435a8658a569c65e 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -143,7 +143,7 @@ public class FallingBlockEntity extends Entity { ++this.time; if (!this.isNoGravity()) { - this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D)); + this.addDeltaMovement(0.0D, -0.04D, 0.0D); // Sakura - reduce movement allocations } this.move(MoverType.SELF, this.getDeltaMovement()); @@ -190,7 +190,7 @@ public class FallingBlockEntity extends Entity { } else { BlockState iblockdata = this.level.getBlockState(blockposition); - this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D)); + this.multiplyDeltaMovement(0.7D, -0.5D, 0.7D); // Sakura - reduce movement allocations if (!iblockdata.is(Blocks.MOVING_PISTON)) { if (!this.cancelDrop) { boolean flag2 = iblockdata.canBeReplaced((BlockPlaceContext) (new DirectionalPlaceContext(this.level, blockposition, Direction.DOWN, ItemStack.EMPTY, Direction.UP))); @@ -257,7 +257,7 @@ public class FallingBlockEntity extends Entity { } } - this.setDeltaMovement(this.getDeltaMovement().scale(0.98D)); + this.scaleDeltaMovement(0.98D); // Sakura - reduce movement allocations } } diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java index 23ba4fc50c0d45f1e5d666ff583b91665cab19f0..480d3025977b8f3710e4252a9127a1c018f532d1 100644 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java @@ -63,7 +63,7 @@ public class PrimedTnt extends Entity implements TraceableEntity { public void tick() { if (level.spigotConfig.maxTntTicksPerTick > 0 && ++level.spigotConfig.currentPrimedTnt > level.spigotConfig.maxTntTicksPerTick) { return; } // Spigot if (!this.isNoGravity()) { - this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D)); + this.addDeltaMovement(0.0D, -0.04D, 0.0D); // Sakura - reduce movement allocations } this.move(MoverType.SELF, this.getDeltaMovement()); @@ -73,9 +73,9 @@ public class PrimedTnt extends Entity implements TraceableEntity { return; } // Paper end - this.setDeltaMovement(this.getDeltaMovement().scale(0.98D)); + this.scaleDeltaMovement(0.98D); // Sakura - reduce movement allocations if (this.onGround) { - this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D)); + this.multiplyDeltaMovement(0.7D, -0.5D, 0.7D); // Sakura - reduce movement allocations } int i = this.getFuse() - 1; diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java index 185f7b1d4df59f5db7b85b529a2de6402630bf35..3cb5306a2ccfc1c53f90ecd56980d17be4042093 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -280,10 +280,11 @@ public class Explosion { d8 *= d14; d9 *= d14; d10 *= d14; - Vec3 vec3d1 = new Vec3(d8, d9, d10); + // Sakura - moved down - entity.setDeltaMovement(entity.getDeltaMovement().add(vec3d1)); + entity.addDeltaMovement(d8, d9, d10); // Sakura reduce deltamovement allocations if (entity instanceof Player) { + Vec3 vec3d1 = new Vec3(d8, d9, d10); // Sakura Player entityhuman = (Player) entity; if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.getAbilities().flying) && !level.paperConfig().environment.disableExplosionKnockback) { // Paper - Disable explosion knockback diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java index 4f91e4832a94c3facbc711fcae4cb5ad540a5ca0..004f6b0d27b5fd55b1e9c2896417c739336a6293 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -457,7 +457,7 @@ public class Block extends BlockBehaviour implements ItemLike { } public void updateEntityAfterFallOn(BlockGetter world, Entity entity) { - entity.setDeltaMovement(entity.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D)); + entity.multiplyDeltaMovement(1.0D, 0.0D, 1.0D); // Sakura } public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) {