From 390139846afa2af37f73d9e845ef5f07823e85e8 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 16:53:52 +0200 Subject: [PATCH] Avoid dimension id collisions (#1487) getDimensionId() returns the dimension id - 1. So without this patch we would reuse an existing dimension id, if some other dimension was unloaded before. In Spigot this is nearly invisible because DimensionManager has no equals(), so dimension id collisions just create 2 worlds with the same dimension. The PaperWorldMap (Added in https://github.com/PaperMC/Paper/blob/master/Spigot-Server-Patches/0376-Optimize-Server-World-Map.patch ) changes this - Now the dimension is overwritten if there is some collision, what causes players to teleport to incorrect worlds, World checks will no longer work and many more evil things. --- .../Avoid-dimension-id-collisions.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Spigot-Server-Patches/Avoid-dimension-id-collisions.patch diff --git a/Spigot-Server-Patches/Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/Avoid-dimension-id-collisions.patch new file mode 100644 index 000000000..b433f0c1b --- /dev/null +++ b/Spigot-Server-Patches/Avoid-dimension-id-collisions.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Brokkonaut +Date: Tue, 25 Sep 2018 06:53:43 +0200 +Subject: [PATCH] Avoid dimension id collisions + +getDimensionId() returns the dimension id - 1. So without this patch +we would reuse an existing dimension id, if some other dimension was +unloaded before. + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 23663ede9..cb2255a5d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -0,0 +0,0 @@ public final class CraftServer implements Server { + boolean used = false; + do { + for (WorldServer server : console.getWorlds()) { +- used = server.dimension.getDimensionID() == dimension; ++ used = server.dimension.getDimensionID() + 1 == dimension; // Paper - getDimensionID returns the dimension - 1, so we have to add 1 + if (used) { + dimension++; + break; +-- \ No newline at end of file