Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 00:09:25 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-01-27 17:28:39 -05:00
parent 469ba11801
commit 6ffb717c43
51 changed files with 349 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0123-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 33b8551ef0d7ac3b29a1c111088a2c1912f5e494..4e51fb4555349bc486e80bcd72b58e3ede1bd1f8 100644
index 67f0ca38ceae1e1485bc23fa862bb3f13de880a6..df2d663ac85ec6b9c15e3bcd7ee4f2924deffd1e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -43,6 +43,9 @@ import java.util.logging.Logger;
@@ -34,7 +34,7 @@ index 33b8551ef0d7ac3b29a1c111088a2c1912f5e494..4e51fb4555349bc486e80bcd72b58e3e
private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1448,6 +1452,7 @@ public final class CraftServer implements Server {
@@ -1447,6 +1451,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 33b8551ef0d7ac3b29a1c111088a2c1912f5e494..4e51fb4555349bc486e80bcd72b58e3e
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1466,12 +1471,7 @@ public final class CraftServer implements Server {
@@ -1465,12 +1470,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 33b8551ef0d7ac3b29a1c111088a2c1912f5e494..4e51fb4555349bc486e80bcd72b58e3e
}
// Paper start
@@ -1489,6 +1489,7 @@ public final class CraftServer implements Server {
@@ -1488,6 +1488,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;
}