aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0988-Configurable-Sand-Duping.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2024-11-28 17:39:40 -0800
committerSpottedleaf <[email protected]>2024-11-28 18:27:59 -0800
commitda9d110d5bf8ffb090d63cd6a443b22ef1ab9d64 (patch)
tree9dbb88d122e6c21827c230041f0b7c93d5a03bf0 /patches/server/0988-Configurable-Sand-Duping.patch
parent0cc7bd485760dd0abd387f64d193ffef7aa019ee (diff)
downloadPaper-da9d110d5bf8ffb090d63cd6a443b22ef1ab9d64.tar.gz
Paper-da9d110d5bf8ffb090d63cd6a443b22ef1ab9d64.zip
Remove chunk save reattempt patch
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
Diffstat (limited to 'patches/server/0988-Configurable-Sand-Duping.patch')
-rw-r--r--patches/server/0988-Configurable-Sand-Duping.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0988-Configurable-Sand-Duping.patch b/patches/server/0988-Configurable-Sand-Duping.patch
new file mode 100644
index 0000000000..d209e03e1e
--- /dev/null
+++ b/patches/server/0988-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 0ecda05a98046938546fe7bc6cf2590c886add41..06d9a519e64d4b8b8764b3ad7691ad93b5cee065 100644
+--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+@@ -435,7 +435,7 @@ public class FallingBlockEntity extends Entity {
+ boolean flag = (resourcekey1 == Level.END || resourcekey == Level.END) && resourcekey1 != resourcekey;
+ Entity entity = super.teleport(teleportTarget);
+
+- this.forceTickAfterTeleportToDuplicate = entity != null && flag;
++ this.forceTickAfterTeleportToDuplicate = entity != null && flag && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation; // Paper
+ return entity;
+ }
+ }