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:
a96d3e89 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-01 20:56:22 -05:00
parent 3b4e44ff44
commit eed34befaa
10 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From cf1df09b2a81a4e2d37f240578d2b4cb330887b7 Mon Sep 17 00:00:00 2001
From 049e07a77b3110ad4685e5e2ffc797f7410a1650 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:53:58 -0800
Subject: [PATCH] Tuinity Server Changes
@@ -6715,10 +6715,10 @@ index 4ec53a54e..31c81b4b5 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3bbc2d78b..cebcb845b 100644
index 56bf840e3..2d042e058 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -6727,7 +6727,7 @@ index 3bbc2d78b..cebcb845b 100644
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -846,6 +846,7 @@ public final class CraftServer implements Server {
@@ -848,6 +848,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
@@ -6735,7 +6735,7 @@ index 3bbc2d78b..cebcb845b 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -880,6 +881,7 @@ public final class CraftServer implements Server {
@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -6743,7 +6743,7 @@ index 3bbc2d78b..cebcb845b 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1817,7 +1819,10 @@ public final class CraftServer implements Server {
@@ -1821,7 +1823,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -6755,7 +6755,7 @@ index 3bbc2d78b..cebcb845b 100644
}
@Override
@@ -2204,6 +2209,14 @@ public final class CraftServer implements Server {
@@ -2208,6 +2213,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}