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

Updated Upstream (Paper)

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

Paper Changes:
613bdc3f [Auto] Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-09-14 13:19:01 -05:00
parent 0e1cb93964
commit d4301d4a64
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7292,10 +7292,10 @@ index ff8ba5457..ecedc167d 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fd649a0d2..77adc7528 100644
index d8d29d145..786ddcee7 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
@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -7304,7 +7304,7 @@ index fd649a0d2..77adc7528 100644
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -854,6 +854,7 @@ public final class CraftServer implements Server {
@@ -856,6 +856,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
@@ -7312,7 +7312,7 @@ index fd649a0d2..77adc7528 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -888,6 +889,7 @@ public final class CraftServer implements Server {
@@ -890,6 +891,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -7320,7 +7320,7 @@ index fd649a0d2..77adc7528 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1829,7 +1831,10 @@ public final class CraftServer implements Server {
@@ -1831,7 +1833,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -7332,7 +7332,7 @@ index fd649a0d2..77adc7528 100644
}
@Override
@@ -2239,6 +2244,14 @@ public final class CraftServer implements Server {
@@ -2250,6 +2255,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}