Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 08:49:28 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-06-16 16:48:40 +02:00
parent cbcc8ae616
commit d20306e8d1
13 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0126-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bedd0c5a1e1 100644
index 2dcbd2763a892351a2e0cb6cfc9843aeb1edfec6..d3586e8eb5c0bdeda3a966300dd6537e32e647d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -42,6 +42,9 @@ import java.util.logging.Level;
@@ -34,7 +34,7 @@ index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bed
private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1340,6 +1344,7 @@ public final class CraftServer implements Server {
@@ -1344,6 +1348,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bed
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1358,12 +1363,7 @@ public final class CraftServer implements Server {
@@ -1362,12 +1367,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bed
}
// Paper start
@@ -1381,6 +1381,7 @@ public final class CraftServer implements Server {
@@ -1385,6 +1385,7 @@ public final class CraftServer implements Server {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}