Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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

12
patches/server/0003-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From a3d3e58ef40bbd5ccd54c189cd411a952c752593 Mon Sep 17 00:00:00 2001
From 5b76af39666ae3487ad49feb5cd0a09f8838c05e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
@@ -355,10 +355,10 @@ index 000000000..4904be939
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 56a2db25f..957baebc4 100644
index a083aeb5d..efa1b59fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -847,6 +847,7 @@ public final class CraftServer implements Server {
@@ -849,6 +849,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
com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -366,7 +366,7 @@ index 56a2db25f..957baebc4 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
@@ -884,6 +885,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
@@ -374,7 +374,7 @@ index 56a2db25f..957baebc4 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -900,6 +902,7 @@ public final class CraftServer implements Server {
@@ -902,6 +904,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -382,7 +382,7 @@ index 56a2db25f..957baebc4 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2217,6 +2220,18 @@ public final class CraftServer implements Server {
@@ -2221,6 +2224,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report