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 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3b9db2b Updated Upstream (Bukkit/CraftBukkit) (#11501)
PaperMC/Paper@c13f9fd Fix potential annotation testing interruption (#11460)
PaperMC/Paper@260c3bb Always send Banner patterns to the client (#11506)
PaperMC/Paper@14a48cd Some small touchups to the GUI (#11505)
PaperMC/Paper@d348cb8 Restrict BlockProjectileSource#launchProjectile
This commit is contained in:
Dreeam
2024-10-22 09:19:04 -04:00
parent 5fffc5ef30
commit e893e3d762
11 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0105-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 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e68014ac3ccd3 100644
index 84b8de571361f2087ac5106726c9e69377183089..9261f0ff637213a385fd518524702e777a4bb692 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.Logger;
@@ -34,7 +34,7 @@ index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e6801
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1491,6 +1495,7 @@ public final class CraftServer implements Server {
@@ -1493,6 +1497,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e6801
this.worlds.remove(world.getName().toLowerCase(Locale.ROOT));
this.console.removeLevel(handle);
return true;
@@ -1509,12 +1514,7 @@ public final class CraftServer implements Server {
@@ -1511,12 +1516,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e6801
}
// Paper start
@@ -1532,6 +1532,7 @@ public final class CraftServer implements Server {
@@ -1534,6 +1534,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;
}