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-19 07:27:39 -04:00
parent 06d5d34300
commit c3d6cff782
32 changed files with 327 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0117-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 31a7cdc94ab7946e05f00a9c0996feafee6e95af..c8e32a0c91d5943987d1b680a831cf449fdd59c6 100644
index 5756ea8ca76f47118ac0b06a02c5663b1b544518..8fc6d5c02065027520cfa6eef109820b0476477a 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;
@@ -40,6 +40,9 @@ import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.imageio.ImageIO;
// import jline.console.ConsoleReader;
@@ -26,7 +26,7 @@ index 31a7cdc94ab7946e05f00a9c0996feafee6e95af..c8e32a0c91d5943987d1b680a831cf44
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
@@ -283,6 +286,7 @@ public final class CraftServer implements Server {
@@ -279,6 +282,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 31a7cdc94ab7946e05f00a9c0996feafee6e95af..c8e32a0c91d5943987d1b680a831cf44
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1469,6 +1473,7 @@ public final class CraftServer implements Server {
@@ -1455,6 +1459,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 31a7cdc94ab7946e05f00a9c0996feafee6e95af..c8e32a0c91d5943987d1b680a831cf44
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1487,12 +1492,7 @@ public final class CraftServer implements Server {
@@ -1473,12 +1478,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 31a7cdc94ab7946e05f00a9c0996feafee6e95af..c8e32a0c91d5943987d1b680a831cf44
}
// Paper start
@@ -1510,6 +1510,7 @@ public final class CraftServer implements Server {
@@ -1496,6 +1496,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;
}