OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 19:52:55 +01:00
Code Issues Projects Releases Packages Wiki Activity
PaperMC/Spigot-Server-Patches/0314-Avoid-dimension-id-collisions.patch

26 lines
1.2 KiB
Diff
Raw Normal View History

Updated Upstream (CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
2019-07-17 00:09:32 +02:00
From dac39792514978b124764723c37284f751849373 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
Updated Upstream (CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
2019-07-17 00:09:32 +02:00
index da8cb53ab..752427d91 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c2d72c82 SPIGOT-3102: Add EXPLOSION SpawnReason CraftBukkit Changes: fca41573 SPIGOT-5136: EntityPortalEvent getting called on interdimensional entity teleports 604c8bf0 SPIGOT-3102: Add EXPLOSION SpawnReason 375969a6 Re-add chunk GC for plugin chunk loads 58151368 SPIGOT-5123: Snapshot tile entities can end up with a non-null world 491c8482 SPIGOT-5130: PersistentDataContainer not removing values on TileEntities Spigot Changes: d05d3c1f Rebuild patches
2019-07-05 04:13:38 +02:00
@@ -976,7 +976,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 a new issue Copy permalink