diff options
author | Jake Potrebic <[email protected]> | 2024-07-16 16:39:57 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2024-07-16 16:39:57 -0700 |
commit | 506f1651e549c290142df8d1e2e8ea831bc381c0 (patch) | |
tree | 250f8cb16a8e94a588aa9df694e199f3e45ae824 /patches/server/1018-Configurable-Sand-Duping.patch | |
parent | a6ceda12c54cd8b7d272fe50e744c9b9a26d0838 (diff) | |
download | Paper-506f1651e549c290142df8d1e2e8ea831bc381c0.tar.gz Paper-506f1651e549c290142df8d1e2e8ea831bc381c0.zip |
Don't store removed components in multiple places (#11091)
Diffstat (limited to 'patches/server/1018-Configurable-Sand-Duping.patch')
-rw-r--r-- | patches/server/1018-Configurable-Sand-Duping.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/1018-Configurable-Sand-Duping.patch b/patches/server/1018-Configurable-Sand-Duping.patch new file mode 100644 index 0000000000..cbc52697db --- /dev/null +++ b/patches/server/1018-Configurable-Sand-Duping.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Owen1212055 <[email protected]> +Date: Sat, 15 Jun 2024 22:01:39 -0400 +Subject: [PATCH] Configurable Sand Duping + + +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 caf9273cfafbbaaf8dc95498927383e608773665..b83be9bbb9f348da83c0fd1ecc7f65c8a58b45b9 100644 +--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java ++++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +@@ -419,7 +419,7 @@ public class FallingBlockEntity extends Entity { + boolean flag = (resourcekey1 == Level.END || resourcekey == Level.END) && resourcekey1 != resourcekey; + Entity entity = super.changeDimension(teleportTarget); + +- this.forceTickAfterTeleportToDuplicate = entity != null && flag; ++ this.forceTickAfterTeleportToDuplicate = entity != null && flag && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation; // Paper + return entity; + } + } |