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

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-06-08 23:16:40 +02:00
parent fe9c202027
commit dad62237f8
46 changed files with 193 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0129-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,10 +13,10 @@ 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 349b73d0e50499557237650a3c766bffa4943713..5f77acf3e0d68985bf2b27d13f0f51e6e3a6cf1c 100644
index 23438408f99d11522d4559900dc67566bc662587..877b4a813c6d781635d8647dbb18f8445cd88a6e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -41,6 +41,9 @@ import java.util.logging.Level;
@@ -42,6 +42,9 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.imageio.ImageIO;
@@ -26,7 +26,7 @@ index 349b73d0e50499557237650a3c766bffa4943713..5f77acf3e0d68985bf2b27d13f0f51e6
import net.minecraft.advancements.Advancement;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
@@ -271,6 +274,7 @@ public final class CraftServer implements Server {
@@ -277,6 +280,7 @@ public final class CraftServer implements Server {
protected final DedicatedServer console;
protected final DedicatedPlayerList playerList;
private final Map<String, World> worlds = new LinkedHashMap<String, World>();
@@ -34,7 +34,7 @@ index 349b73d0e50499557237650a3c766bffa4943713..5f77acf3e0d68985bf2b27d13f0f51e6
private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1316,6 +1320,7 @@ public final class CraftServer implements Server {
@@ -1339,6 +1343,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 349b73d0e50499557237650a3c766bffa4943713..5f77acf3e0d68985bf2b27d13f0f51e6
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1334,12 +1339,7 @@ public final class CraftServer implements Server {
@@ -1357,12 +1362,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 349b73d0e50499557237650a3c766bffa4943713..5f77acf3e0d68985bf2b27d13f0f51e6
}
// Paper start
@@ -1357,6 +1357,7 @@ public final class CraftServer implements Server {
@@ -1380,6 +1380,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;
}