mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
654b792caf
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:a339310c#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bfIncrease outdated build delay1dabfdc8#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
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 f5cd0c6e3b6d375fb227802e3620dab52f0f4de4..492a4cf1a8b1a26624b093d7f6946bfd8277c4f9 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)) {
|