2019-05-06 04:58:04 +02:00
|
|
|
From 153b5016a2198566e64fa7ee72e2b1dd557d020e Mon Sep 17 00:00:00 2001
|
2018-09-25 16:53:52 +02:00
|
|
|
From: Brokkonaut <hannos17@gmx.de>
|
|
|
|
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
|
2019-05-06 04:58:04 +02:00
|
|
|
index 0d0d056cff..1eb60b54b5 100644
|
2018-09-25 16:53:52 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2019-05-05 10:33:44 +02:00
|
|
|
@@ -970,7 +970,7 @@ public final class CraftServer implements Server {
|
2018-09-25 16:53:52 +02:00
|
|
|
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;
|
|
|
|
--
|
2019-05-05 13:32:20 +02:00
|
|
|
2.21.0
|
2018-09-25 16:53:52 +02:00
|
|
|
|