Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-28 19:29:09 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@86a6543 Updated Upstream (Paper)
PurpurMC/Purpur@2e39567 Re-add missing chunk api calls, fixes #1560
PurpurMC/Purpur@eadfff7 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-07-18 23:26:42 +03:00
parent 451eb3ec0b
commit e1d2ae3390
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize CraftServer.getWorld(UUID)
Original code by MultiPaper - https://github.com/MultiPaper/MultiPaper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598d1218b5a 100644
index 7257d1052746d90662bb2a796b2f437fc0a2e9ab..1a9964d77202df87b05fb47ba1edb62e7be17049 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -266,6 +266,7 @@ import javax.annotation.Nullable; // Paper
@@ -25,7 +25,7 @@ index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
@@ -1492,6 +1494,7 @@ public final class CraftServer implements Server {
@@ -1501,6 +1503,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -33,7 +33,7 @@ index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598
this.worlds.remove(world.getName().toLowerCase(Locale.ROOT));
this.console.removeLevel(handle);
return true;
@@ -1510,6 +1513,7 @@ public final class CraftServer implements Server {
@@ -1519,6 +1522,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -41,7 +41,7 @@ index 7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece..0a0ba7c205f5acef31e9b825022c9598
for (World world : this.worlds.values()) {
if (world.getUID().equals(uid)) {
return world;
@@ -1533,6 +1537,7 @@ public final class CraftServer implements Server {
@@ -1542,6 +1546,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;
}