diff --git a/Paper b/Paper index e0d8e0dde..92e77aa7c 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit e0d8e0dde576d400eb5f1c19e05dfbfdac2362cd +Subproject commit 92e77aa7cbbf626cb9e6fad97032509de74a2018 diff --git a/current-paper b/current-paper index 6a6cce13d..996b62f8b 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14--19b5a6742bd812013f0921ee7ca191734ba47602 +1.14--3811479ebbf8485ed9f48a31ae2fddfb0d0960d9 diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index 730db74a9..8bbbc7c30 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From 59f6f2e5c04bcb8dd2dcfabde239f9683f623288 Mon Sep 17 00:00:00 2001 +From 2d2f2793e13ed5c14e91f1457efb7f54761f3b85 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 cae59ed37..fdd316779 100644 +index 4caf5d9af..a9a358955 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 cae59ed37..fdd316779 100644 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPosition lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -116,6 +118,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -117,6 +119,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