Paper/patches/server/0411-Fix-sand-duping.patch

39 lines
1.6 KiB
Diff
Raw Permalink 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
2023-06-08 01:20:26 +02:00
index 95bcd8f03a784287c5a6106c784448e54c4b531b..4a44109df0aece6661567dac5ebf6355de5d58c7 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
2023-03-14 20:54:57 +01:00
@@ -129,6 +129,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 {
2023-06-08 01:20:26 +02:00
@@ -140,6 +145,13 @@ public class FallingBlockEntity extends Entity {
}
2021-06-11 14:02:28 +02:00
this.move(MoverType.SELF, this.getDeltaMovement());
2023-06-08 01:20:26 +02:00
+
2021-06-11 14:02:28 +02:00
+ // 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
2023-06-08 01:20:26 +02:00
if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {