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

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-05-28 18:02:07 +08:00
parent 876e3b3853
commit 4ddda03524
29 changed files with 121 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0117-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 e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd4803e9f3382 100644
index e9c6087c2b6cae716384d28970eac3edad001d2a..1ee326e8904f3a0e725b9dc4bc6e6decdb190b1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -40,6 +40,9 @@ import java.util.logging.Logger;
@@ -34,7 +34,7 @@ index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd480
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1450,6 +1454,7 @@ public final class CraftServer implements Server {
@@ -1451,6 +1455,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd480
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1468,12 +1473,7 @@ public final class CraftServer implements Server {
@@ -1469,12 +1474,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index e738c814f9b24e9a2593e9b91294a9f67231a5b4..69b23604d7a8ca40eb8b025d70dfd480
}
// Paper start
@@ -1491,6 +1491,7 @@ public final class CraftServer implements Server {
@@ -1492,6 +1492,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;
}