aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0928-More-Raid-API.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2024-10-25 12:24:15 -0700
committerSpottedleaf <[email protected]>2024-10-25 12:24:15 -0700
commitb711764991073ae1556969a9a86a4501c8767be0 (patch)
treea34e30205c5c7140401775332a73ab18f3b1fd09 /patches/server/0928-More-Raid-API.patch
parent62e3bcdc3bb7da4d268038e7d06c25fab01b3e2c (diff)
downloadPaper-b711764991073ae1556969a9a86a4501c8767be0.tar.gz
Paper-b711764991073ae1556969a9a86a4501c8767be0.zip
Rebase fixups
Diffstat (limited to 'patches/server/0928-More-Raid-API.patch')
-rw-r--r--patches/server/0928-More-Raid-API.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0928-More-Raid-API.patch b/patches/server/0928-More-Raid-API.patch
index daaeb2bdea..2039ffa00d 100644
--- a/patches/server/0928-More-Raid-API.patch
+++ b/patches/server/0928-More-Raid-API.patch
@@ -86,7 +86,7 @@ index b8ce1c1c2447f9cff1717bfcfd6eb911ade0d4b3..51f21af9d75769abdcba713b9aa33392
+ // Paper end - more Raid API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 50b3f5c185b8bb7965226c97a37faf714f5beb0a..51b10d9cceb4dfbea5e1d82d0404948c6cdc5944 100644
+index 34e8afae13085f0a9ce0c916d911c88c395418e0..406a3b4a6e213879a9b262d2ffa9ba404cf31cc1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2326,6 +2326,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {