mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851) b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
@@ -1,4 +1,4 @@
|
||||
From 33b955d71a7fe318ade45591dad05f8f7f100069 Mon Sep 17 00:00:00 2001
|
||||
From d20b11c80a0669443b803890a1549903e33010b4 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
|
||||
@@ -21,7 +21,7 @@ Subject: [PATCH] Purpur config files
|
||||
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 1d7d1ffbf..d886f1d14 100644
|
||||
index 1d7d1ffbf7..d886f1d145 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -96,10 +96,12 @@ public class PaperConfig {
|
||||
@@ -38,7 +38,7 @@ index 1d7d1ffbf..d886f1d14 100644
|
||||
|
||||
static void readConfig(Class<?> clazz, Object instance) {
|
||||
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
|
||||
index 5edae85e7..76d8e55ca 100644
|
||||
index feec44f572..8867338652 100644
|
||||
--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
|
||||
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
|
||||
@@ -19,7 +19,7 @@ public final class TuinityConfig {
|
||||
@@ -51,7 +51,7 @@ index 5edae85e7..76d8e55ca 100644
|
||||
|
||||
public static void init(final File file) {
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index ede436939..8c7156bb5 100644
|
||||
index ede4369399..8c7156bb52 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@@ -71,10 +71,10 @@ index ede436939..8c7156bb5 100644
|
||||
// Paper end
|
||||
com.tuinity.tuinity.config.TuinityConfig.init((File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index c0c83d433..ba1dab794 100644
|
||||
index 5f69a018d9..5afd548aa0 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -81,6 +81,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -83,6 +83,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
|
||||
|
||||
public final com.tuinity.tuinity.config.TuinityConfig.WorldConnfig tuinityConfig; // Tuinity - Server Config
|
||||
@@ -82,7 +82,7 @@ index c0c83d433..ba1dab794 100644
|
||||
|
||||
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
|
||||
public static BlockPosition lastPhysicsProblem; // Spigot
|
||||
@@ -132,6 +133,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -134,6 +135,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
|
||||
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
|
||||
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConnfig(worlddata.getName()); // Tuinity - Server Config
|
||||
@@ -92,7 +92,7 @@ index c0c83d433..ba1dab794 100644
|
||||
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
|
||||
new file mode 100644
|
||||
index 000000000..246eb8140
|
||||
index 0000000000..246eb8140f
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/Metrics.java
|
||||
@@ -0,0 +1,598 @@
|
||||
@@ -696,7 +696,7 @@ index 000000000..246eb8140
|
||||
+}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
|
||||
new file mode 100644
|
||||
index 000000000..f8cf4ad23
|
||||
index 0000000000..f8cf4ad234
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
|
||||
@@ -0,0 +1,66 @@
|
||||
@@ -768,7 +768,7 @@ index 000000000..f8cf4ad23
|
||||
+}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
new file mode 100644
|
||||
index 000000000..706d78757
|
||||
index 0000000000..706d787579
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -0,0 +1,135 @@
|
||||
@@ -909,7 +909,7 @@ index 000000000..706d78757
|
||||
+}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
new file mode 100644
|
||||
index 000000000..eda37fa43
|
||||
index 0000000000..eda37fa43f
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -0,0 +1,67 @@
|
||||
@@ -981,10 +981,10 @@ index 000000000..eda37fa43
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 23c3a69fa..0e4cea4db 100644
|
||||
index 3a0e027e67..d293bf27ac 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -797,6 +797,7 @@ public final class CraftServer implements Server {
|
||||
@@ -807,6 +807,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
|
||||
@@ -992,7 +992,7 @@ index 23c3a69fa..0e4cea4db 100644
|
||||
for (WorldServer world : console.getWorlds()) {
|
||||
world.worldData.setDifficulty(config.difficulty);
|
||||
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
|
||||
@@ -814,6 +815,7 @@ public final class CraftServer implements Server {
|
||||
@@ -836,6 +837,7 @@ public final class CraftServer implements Server {
|
||||
world.spigotConfig.init(); // Spigot
|
||||
world.paperConfig.init(); // Paper
|
||||
world.tuinityConfig.init(); // Tuinity - Server Config
|
||||
@@ -1000,7 +1000,7 @@ index 23c3a69fa..0e4cea4db 100644
|
||||
}
|
||||
|
||||
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||
@@ -832,6 +834,7 @@ public final class CraftServer implements Server {
|
||||
@@ -854,6 +856,7 @@ public final class CraftServer implements Server {
|
||||
reloadData();
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
|
||||
@@ -1008,7 +1008,7 @@ index 23c3a69fa..0e4cea4db 100644
|
||||
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||
|
||||
@@ -2065,6 +2068,23 @@ public final class CraftServer implements Server {
|
||||
@@ -2087,6 +2090,23 @@ public final class CraftServer implements Server {
|
||||
return com.destroystokyo.paper.PaperConfig.config;
|
||||
}
|
||||
|
||||
@@ -1033,7 +1033,7 @@ index 23c3a69fa..0e4cea4db 100644
|
||||
public void restart() {
|
||||
org.spigotmc.RestartCommand.restart();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 2666940e8..7fc56f67f 100644
|
||||
index 2666940e86..7fc56f67fd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -145,6 +145,14 @@ public class Main {
|
||||
|
||||
Reference in New Issue
Block a user