PaperMC/patches/server/0419-Fix-sand-duping.patch

38 lines
1.6 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 97b2d12713d2245f1621d3ade5b5655b5897cbf4..06f6fe4d1be4b14c45d2576561201c9386988dc1 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
2022-12-07 21:16:54 +01:00
@@ -128,6 +128,11 @@ public class FallingBlockEntity extends Entity {
2021-06-11 14:02:28 +02:00
@Override
public void tick() {
+ // Paper start - fix sand duping
+ if (this.isRemoved()) {
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // Paper end - fix sand duping
if (this.blockState.isAir()) {
this.discard();
2022-03-01 06:43:03 +01:00
} else {
2022-12-07 21:16:54 +01:00
@@ -140,6 +145,12 @@ public class FallingBlockEntity extends Entity {
2021-06-11 14:02:28 +02:00
this.move(MoverType.SELF, this.getDeltaMovement());
+ // Paper start - fix sand duping
+ if (this.isRemoved()) {
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // Paper end - fix sand duping
+
// Paper start - Configurable EntityFallingBlock height nerf
if (this.level.paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
2021-06-11 14:02:28 +02:00
if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {