Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 14:33:56 +01:00
Code Issues Projects Releases Wiki Activity
bd46b6397c
Paper/Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch

26 lines
1.2 KiB
Diff
Raw Normal View History

Update upstream B/CB/S --- work/Bukkit Submodule work/Bukkit aba2aaaf..949124e0: > SPIGOT-5121: Method to set PierceLevel of arrows --- work/CraftBukkit Submodule work/CraftBukkit c6997924..bf329334: > SPIGOT-5133: Throwing items into secondary end world portal causes crash > SPIGOT-5121: Method to set PierceLevel of arrows > SPIGOT-5122: Skip world#notify if sign has no world. > SPIGOT-5105: The EntityTag nbt tag disappears from preset armor_stand items. > SPIGOT-5106: Config option to prevent plugins with incompatible API's from loading --- work/Spigot Submodule work/Spigot 595711b0..935adb34: > SPIGOT-5088: Additional growth modifiers
2019-07-02 06:51:06 +02:00
From cb6da24d166268ef036b7deee3e063b6b26b34e4 Mon Sep 17 00:00:00 2001
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.
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
Update upstream B/CB/S --- work/Bukkit Submodule work/Bukkit aba2aaaf..949124e0: > SPIGOT-5121: Method to set PierceLevel of arrows --- work/CraftBukkit Submodule work/CraftBukkit c6997924..bf329334: > SPIGOT-5133: Throwing items into secondary end world portal causes crash > SPIGOT-5121: Method to set PierceLevel of arrows > SPIGOT-5122: Skip world#notify if sign has no world. > SPIGOT-5105: The EntityTag nbt tag disappears from preset armor_stand items. > SPIGOT-5106: Config option to prevent plugins with incompatible API's from loading --- work/Spigot Submodule work/Spigot 595711b0..935adb34: > SPIGOT-5088: Additional growth modifiers
2019-07-02 06:51:06 +02:00
index 642b34a37..bab0ca869 100644
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.
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
Update upstream B/CB/S --- work/Bukkit Submodule work/Bukkit aba2aaaf..949124e0: > SPIGOT-5121: Method to set PierceLevel of arrows --- work/CraftBukkit Submodule work/CraftBukkit c6997924..bf329334: > SPIGOT-5133: Throwing items into secondary end world portal causes crash > SPIGOT-5121: Method to set PierceLevel of arrows > SPIGOT-5122: Skip world#notify if sign has no world. > SPIGOT-5105: The EntityTag nbt tag disappears from preset armor_stand items. > SPIGOT-5106: Config option to prevent plugins with incompatible API's from loading --- work/Spigot Submodule work/Spigot 595711b0..935adb34: > SPIGOT-5088: Additional growth modifiers
2019-07-02 06:51:06 +02:00
@@ -974,7 +974,7 @@ public final class CraftServer implements Server {
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.
2018-09-25 16:53:52 +02:00
boolean used = false;
do {
for (WorldServer server : console.getWorlds()) {
MC 1.14.1
2019-05-14 04:20:58 +02:00
- used = server.getWorldProvider().getDimensionManager().getDimensionID() == dimension;
+ used = server.getWorldProvider().getDimensionManager().getDimensionID() + 1 == dimension; // Paper - getDimensionID returns the dimension - 1, so we have to add 1
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.
2018-09-25 16:53:52 +02:00
if (used) {
dimension++;
break;
--
Revert "Optimize Pathfinding" This patch appears to be causing some issues with 1.14.3 entity AI
2019-06-25 21:18:50 +02:00
2.22.0
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.
2018-09-25 16:53:52 +02:00
Reference in New Issue Copy Permalink