aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0505-Expand-world-key-API.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2024-07-08 22:30:01 +0100
committerShane Freeder <[email protected]>2024-07-08 22:30:01 +0100
commita74d9bf629ab2d502831fb36a251cdac0ab30522 (patch)
tree44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0505-Expand-world-key-API.patch
parent6723f5498616da919762c68978e13c518943ef40 (diff)
parent70b0e844767131681400b3dbace06c2dea13f87c (diff)
downloadPaper-chore/terminal.tar.gz
Paper-chore/terminal.zip
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0505-Expand-world-key-API.patch')
-rw-r--r--patches/server/0505-Expand-world-key-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0505-Expand-world-key-API.patch b/patches/server/0505-Expand-world-key-API.patch
index dab6d8f7be..17d7ac06c4 100644
--- a/patches/server/0505-Expand-world-key-API.patch
+++ b/patches/server/0505-Expand-world-key-API.patch
@@ -67,10 +67,10 @@ index 24c8e9a43affa8ca99c03562aefc3d6402c23281..ec92033fef581e42fb3f36acaba62689
// Check if a World already exists with the UID.
if (this.getWorld(world.getUID()) != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 50322927460ec9464363617e3f7fe5ff8faa1f6f..00e4e899cf7ee5da89a77175e417115e7ba97afd 100644
+index 7427a81a779b82f96d34a3de228c9d59ee77fea7..7e538a5e742914aa496d76ffe5b450397367cf40 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -541,6 +541,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -527,6 +527,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
public int nextEntityId() {
return net.minecraft.world.entity.Entity.nextEntityId();
}