From bf5a93a669d486eabfb1bd2b49613f58bc9dc548 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 25 May 2019 03:07:05 -0500 Subject: [PATCH] Update upstream --- Paper | 2 +- current-paper | 2 +- patches/server/0002-Purpur-config-files.patch | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Paper b/Paper index b3aa7dadc..c2aec55dc 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit b3aa7dadcdaa90777689b7b1fb6655bb6dfd06a8 +Subproject commit c2aec55dceec71f1c37f97ba0d0683a1e29db61e diff --git a/current-paper b/current-paper index c9d9bd074..5d543b978 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.1--5a093e0a193c8c2c936a5d9769c62a318b7b9202 +1.14.1--1283b42ac3c35061a7282a15a3ac52ab0db0b8ea diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index 16cdd0c2a..c68f06073 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From 27442799204447265317974670fb7e1ab7ed172c Mon Sep 17 00:00:00 2001 +From 4e655a9a968797ea5ba3b56d3e7735d0f97e3abf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files @@ -34,7 +34,7 @@ index 3d452fe0e..22e81ee10 100644 // Paper end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c04d73e73..668eb4cbf 100644 +index e4f2aeed2..030d44c2e 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 @@ -46,7 +46,7 @@ index c04d73e73..668eb4cbf 100644 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPosition lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -117,6 +119,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -134,6 +136,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper @@ -235,7 +235,7 @@ index 000000000..30f11fe26 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 188d322ee..d087be7d3 100644 +index 5500c3a22..b04abedb2 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 {