From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 12 Jun 2020 13:33:19 -0700 Subject: [PATCH] Fix sand duping If the falling block dies during teleportation (entity#move), then we need to detect that by placing a check after the move. diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java index 6a03359a781874ed657157e3407897dde71f5b45..9e9b8d8aef62b423828b69fce4875a2ea8fc9911 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -64,6 +64,11 @@ public class EntityFallingBlock extends Entity { @Override public void tick() { + // Paper start - fix sand duping + if (this.dead) { + return; + } + // Paper end - fix sand duping if (this.block.isAir()) { this.die(); } else { @@ -86,6 +91,12 @@ public class EntityFallingBlock extends Entity { this.move(EnumMoveType.SELF, this.getMot()); + // Paper start - fix sand duping + if (this.dead) { + return; + } + // Paper end - fix sand duping + // Paper start - Configurable EntityFallingBlock height nerf if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY() > this.world.paperConfig.fallingBlockHeightNerf) { if (this.dropItem && this.world.getGameRules().getBoolean(GameRules.DO_ENTITY_DROPS)) {