diff options
Diffstat (limited to 'Spigot-Server-Patches/0510-Fix-sand-duping.patch')
| -rw-r--r-- | Spigot-Server-Patches/0510-Fix-sand-duping.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0510-Fix-sand-duping.patch b/Spigot-Server-Patches/0510-Fix-sand-duping.patch new file mode 100644 index 0000000000..6cf9476b0e --- /dev/null +++ b/Spigot-Server-Patches/0510-Fix-sand-duping.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf <[email protected]> +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 40ab0a1e5b8e31f1ef3b2444366784a65f034341..6697b94550054ebbc8d4b3761bd9f36eb7e4ba8a 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)) { |