diff options
| author | Spottedleaf <[email protected]> | 2020-06-20 14:58:35 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-06-20 14:58:35 -0400 |
| commit | 8f28f22ccfc19e064f849b9e391b266720447a5d (patch) | |
| tree | 435e72b7f0de56d3d2f952ad01903381f1eb8aad | |
| parent | 96feb68ad9a79292a1bb2f23312b7bd3b2717bc9 (diff) | |
| download | Paper-8f28f22ccfc19e064f849b9e391b266720447a5d.tar.gz Paper-8f28f22ccfc19e064f849b9e391b266720447a5d.zip | |
Fix sand not dying correctly
If the falling block dies during teleportation (entity#move), then we need
to detect that by placing a check after the move.
| -rw-r--r-- | Spigot-Server-Patches/0543-Fix-sand-duping.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0543-Fix-sand-duping.patch b/Spigot-Server-Patches/0543-Fix-sand-duping.patch new file mode 100644 index 0000000000..a42ac1b7f3 --- /dev/null +++ b/Spigot-Server-Patches/0543-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 6683f7c5f31b88187961335c5f708b8a4f77b5af..243a8c570dd7cc5b1b622ff130c7339f9bcfc79a 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)) { |