Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
db2d501ba Do not print spawn loaded chunks
86ffde038 Add getHandRaised to LivingEntity (#5752)
9072c349a Fix broadcast event and add Adventure broadcast (#5477)
525d0e3d3 fix beacon activate/deactivate events (#5646)
This commit is contained in:
BillyGalbreath
2021-05-30 03:51:59 -05:00
parent 687936be57
commit eb77666ac1
24 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -10935,7 +10935,7 @@ index 1d72af9cace7aa8f1d20c7c1c5be621f533e2dad..b7399d17dd64ca8b1f1fab405cb0ac91
worldData.addProperty("keep-spawn-loaded-range", world.paperConfig.keepLoadedRange);
worldData.addProperty("visible-chunk-count", visibleChunks.size());
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 03823e95e1fbf465ff5b3b2c5743f1beb25de083..264ed751002b3f52294d00d3135503dabc639a13 100644
index bf80e870e6a2a6fe1d4ae1bea355bcd7a0735d3b..6f90a4182e008b49a4b3328e569311382e4bec0d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -268,6 +268,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -20634,7 +20634,7 @@ index e50731723d266ba65b2163df2e935afb8b013a93..a6736d15282715d920bab85eb92074cd
}
value.append("},");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ff79c13bc7717eb9529e802b8e31a1f756b02f97..0e9819a7da160e7a5f28734c4dd3b673c8881792 100644
index cebecee640ed5a7fc2b978e00ff7eb012228267d..507c5255542ba1b958470b4db2c35b1b0b779f17 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -20646,7 +20646,7 @@ index ff79c13bc7717eb9529e802b8e31a1f756b02f97..0e9819a7da160e7a5f28734c4dd3b673
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -881,6 +881,7 @@ public final class CraftServer implements Server {
@@ -880,6 +880,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -20654,7 +20654,7 @@ index ff79c13bc7717eb9529e802b8e31a1f756b02f97..0e9819a7da160e7a5f28734c4dd3b673
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -915,6 +916,7 @@ public final class CraftServer implements Server {
@@ -914,6 +915,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -20662,7 +20662,7 @@ index ff79c13bc7717eb9529e802b8e31a1f756b02f97..0e9819a7da160e7a5f28734c4dd3b673
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1933,7 +1935,10 @@ public final class CraftServer implements Server {
@@ -1937,7 +1939,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -20674,7 +20674,7 @@ index ff79c13bc7717eb9529e802b8e31a1f756b02f97..0e9819a7da160e7a5f28734c4dd3b673
}
// Paper start
@@ -2367,6 +2372,14 @@ public final class CraftServer implements Server {
@@ -2371,6 +2376,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}