Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 10:20:53 +01:00
Code Issues Projects Releases Wiki Activity
ffecc4e264
Paper/Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch

26 lines
1.2 KiB
Diff
Raw Normal View History

Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2
2020-04-12 02:39:21 +02:00
From fa42338dad126ebf5de33faa164321e0c4262811 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 (Bukkit/CraftBukkit) 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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
2020-04-02 23:07:06 +02:00
index f36b642466..4289d029c2 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: 6148fca7 SPIGOT-5484: Add more spawn tick settings CraftBukkit Changes: fc249340 SPIGOT-5484: Add more spawn tick settings Spigot Changes: 6de3d4be Rebuild patches
2020-03-10 12:01:15 +01:00
@@ -1001,7 +1001,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;
--
Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch This patch appears to be no longer relevant, and is seemingly a leading cause of datapack performance being horrific
2020-03-15 21:03:36 +01:00
2.25.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
Reference in New Issue Copy Permalink