2018-12-15 01:17:27 +00:00
|
|
|
From b5ea79cadcb3f0c94babcc29504309d000e9bd38 Mon Sep 17 00:00:00 2001
|
2018-09-25 14:53:52 +00: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
|
2018-12-13 01:41:11 +00:00
|
|
|
index d43f8ce9a..07f6580fd 100644
|
2018-09-25 14:53:52 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2018-12-13 01:41:11 +00:00
|
|
|
@@ -973,7 +973,7 @@ public final class CraftServer implements Server {
|
2018-09-25 14:53:52 +00: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;
|
|
|
|
|
--
|
2018-12-13 01:41:11 +00:00
|
|
|
2.20.0
|
2018-09-25 14:53:52 +00:00
|
|
|
|
