testserver/patches/server/0443-Fix-sand-duping.patch

38 lines
1.7 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00: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
2022-03-01 05:43:03 +00:00
index c1de9740d199dc862f8e85251a5de021499e0031..483127e9418489ad7ba1fbcb14a045d91c1c3c30 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
2022-03-01 05:43:03 +00:00
@@ -119,6 +119,11 @@ public class FallingBlockEntity extends Entity {
2021-06-11 12:02:28 +00:00
@Override
public void tick() {
+ // Paper start - fix sand duping
+ if (this.isRemoved()) {
2021-06-11 12:02:28 +00:00
+ return;
+ }
+ // Paper end - fix sand duping
if (this.blockState.isAir()) {
this.discard();
2022-03-01 05:43:03 +00:00
} else {
@@ -131,6 +136,12 @@ public class FallingBlockEntity extends Entity {
2021-06-11 12:02:28 +00:00
this.move(MoverType.SELF, this.getDeltaMovement());
+ // Paper start - fix sand duping
+ if (this.isRemoved()) {
2021-06-11 12:02:28 +00:00
+ return;
+ }
+ // Paper end - fix sand duping
+
// Paper start - Configurable EntityFallingBlock height nerf
if (this.level.paperConfig.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig.fallingBlockHeightNerf) {
if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {