From c6f6d063de2c8a20138143945b79f879adf2be87 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 12 Jun 2020 13:33:19 -0700 Subject: [PATCH] PaperPR - 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. --- .../java/net/minecraft/server/EntityFallingBlock.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java index 6683f7c5f3..7969b1cd57 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() { + // Purpur start - fix sand duping + if (this.dead) { + return; + } + // Purpur 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()); + // Purpur start - fix sand duping + if (this.dead) { + return; + } + // Purpur 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)) { -- 2.26.2