diff --git a/Paper b/Paper index edd3e778c..1bacdbd16 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit edd3e778c4d4d742ac85b3587b35bb91c93fc1c1 +Subproject commit 1bacdbd1694a47cbd3271a3c266a2b447645e45b diff --git a/current-paper b/current-paper index 8e52fdb5c..20dff1030 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.3--1db522b129de34db5947c1d93433c4c8e1796471 +1.14.3--8ee638466c371aafff0b09e2c6d949b1f3a3156b diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index b3ce372dc..d6ce4ff92 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 375624ad813fe43f8902d8b90813d1d71b8f4678 Mon Sep 17 00:00:00 2001 +From 01ae82c2f8410ff1b97b9a486633992e3b006802 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index 1f3571dd0f..6dab6763da 100644 +index 1f3571dd0..6dab6763d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -73,7 +73,7 @@ index 1f3571dd0f..6dab6763da 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index cd6e259239..bb227bc0fb 100644 +index cd6e25923..bb227bc0f 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -86,7 +86,7 @@ index cd6e259239..bb227bc0fb 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2b99fdc630..5ec9a980c9 100644 +index 2b99fdc63..5ec9a980c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1423,7 +1423,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files @@ -17,7 +17,7 @@ Subject: [PATCH] Purpur config files create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index c1473330fa..f438323be1 100644 +index c1473330f..f438323be 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -174,6 +174,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -37,7 +37,7 @@ index c1473330fa..f438323be1 100644 // Paper end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a7a35d6a6f..c8f198fdf0 100644 +index a7a35d6a6..c8f198fdf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -59,7 +59,7 @@ index a7a35d6a6f..c8f198fdf0 100644 this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit 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 0000000000..293ed7da5f +index 000000000..293ed7da5 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java @@ -0,0 +1,59 @@ @@ -124,7 +124,7 @@ index 0000000000..293ed7da5f +} 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 0000000000..2f87a929c1 +index 000000000..2f87a929c --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -0,0 +1,127 @@ @@ -257,7 +257,7 @@ index 0000000000..2f87a929c1 +} 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 0000000000..30f11fe261 +index 000000000..30f11fe26 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -0,0 +1,63 @@ @@ -325,10 +325,10 @@ index 0000000000..30f11fe261 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c0ac212bc3..624ee90b68 100644 +index bb5aa677c..9eccb787f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -788,6 +788,7 @@ public final class CraftServer implements Server { +@@ -791,6 +791,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 @@ -336,7 +336,7 @@ index c0ac212bc3..624ee90b68 100644 for (WorldServer world : console.getWorlds()) { world.worldData.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -804,6 +805,7 @@ public final class CraftServer implements Server { +@@ -807,6 +808,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper @@ -345,7 +345,7 @@ index c0ac212bc3..624ee90b68 100644 Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 405ea5c465..2d60e75883 100644 +index 405ea5c46..2d60e7588 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -137,6 +137,14 @@ public class Main { diff --git a/patches/server/0021-Bring-back-server-name.patch b/patches/server/0021-Bring-back-server-name.patch index 88e302518..e2fd96271 100644 --- a/patches/server/0021-Bring-back-server-name.patch +++ b/patches/server/0021-Bring-back-server-name.patch @@ -1,4 +1,4 @@ -From 99bea024c7f98be45de976150511d13dbc842fe2 Mon Sep 17 00:00:00 2001 +From b49bc7d1290687f2543fb66caee5febd7f9c1285 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 May 2019 15:19:14 -0500 Subject: [PATCH] Bring back server name @@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name 2 files changed, 8 insertions(+) diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java -index fb092a9416..54c0b4247f 100644 +index fb092a941..54c0b4247 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager