From 917620e80d7cae762d0c657939704a6b4591bc34 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 16:16:17 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 48b6bfe2 Updated Upstream (Bukkit/CraftBukkit/Spigot) --- Paper | 2 +- current-paper | 2 +- patches/server/0001-Rebrand.patch | 8 ++++---- .../server/0017-Tick-loop-config-options.patch | 10 +++++----- .../server/0027-Allow-color-codes-on-signs.patch | 6 +++--- .../0030-Block-and-Fluid-Tick-Events.patch | 8 ++++---- .../0053-Asynchronous-chunk-IO-and-loading.patch | 16 ++++++++-------- .../0056-Players-should-not-cram-to-death.patch | 6 +++--- .../0060-Implement-lagging-threshold.patch | 8 ++++---- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Paper b/Paper index 396d3f13c..48b6bfe2a 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 396d3f13c4266baf91926061939211381647cfbb +Subproject commit 48b6bfe2a636cba20778983cda4d20c78244873e diff --git a/current-paper b/current-paper index 0a363744e..8fdf679fe 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.4--ecdd14b7e6856b6552b2a4664abe0d560cbf85d8 +1.14.4--fc39e1d292f11fa28f455556b05036fbda0b1217 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 530d717f1..11e89cb3a 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From ba1a44094f171832f513edd41f68607f40f97a41 Mon Sep 17 00:00:00 2001 +From c9814cac1d9c5d1fff68005d5265a232972460bc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -86,10 +86,10 @@ 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 eb1006dda7..8d3361e8c7 100644 +index e9a4973592..57a1ab8b9e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1435,7 +1435,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 22 May 2019 22:30:08 -0500 Subject: [PATCH] Tick loop config options @@ -9,10 +9,10 @@ Subject: [PATCH] Tick loop config options 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8d3361e8c7..a45db15075 100644 +index 57a1ab8b9e..d5a9a5f069 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -880,16 +880,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Allow color codes on signs @@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs 4 files changed, 21 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 89a4f435b7..20326f1907 100644 +index 18695d9b5c..8c59692b2b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1115,6 +1115,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1114,6 +1114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void openSign(TileEntitySign tileentitysign) { tileentitysign.a((EntityHuman) this); diff --git a/patches/server/0030-Block-and-Fluid-Tick-Events.patch b/patches/server/0030-Block-and-Fluid-Tick-Events.patch index b7fb10a5f..d4b6d6c26 100644 --- a/patches/server/0030-Block-and-Fluid-Tick-Events.patch +++ b/patches/server/0030-Block-and-Fluid-Tick-Events.patch @@ -1,4 +1,4 @@ -From dd63902c60c2ddef3553d15f59fce819d9d902ca Mon Sep 17 00:00:00 2001 +From 5fadba03d3eee640f5e3e1a76aab927393d333d1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 23:23:52 -0500 Subject: [PATCH] Block and Fluid Tick Events @@ -10,7 +10,7 @@ Subject: [PATCH] Block and Fluid Tick Events 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 607e37cb91..5f82145723 100644 +index 6491596538..8446dfd0a0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -445,13 +445,13 @@ public class WorldServer extends World { @@ -62,10 +62,10 @@ index 9dfba251ea..775d40ab1b 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d06716c006..48f3a784a8 100644 +index a734a87c41..9b4e57424e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2336,6 +2336,24 @@ public class CraftWorld implements World { +@@ -2338,6 +2338,24 @@ public class CraftWorld implements World { } // Paper end diff --git a/patches/server/0053-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0053-Asynchronous-chunk-IO-and-loading.patch index 3f781deed..19c1df186 100644 --- a/patches/server/0053-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/0053-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From f96b36338d8d134959290156ae37f2803bd1a97e Mon Sep 17 00:00:00 2001 +From b476a4ea3ff570906168abcf59ec3963b13c1ea2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -274,7 +274,7 @@ index 750ca9727a..58e2a07079 100644 + } } diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java -index 9d8bee5cac..dc59b6431b 100644 +index 23626bef3a..1edcecd2ee 100644 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -9,6 +9,7 @@ import java.util.concurrent.Executors; @@ -2737,10 +2737,10 @@ index 23d1935dd5..14f8b61042 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a45db15075..c5e89790fc 100644 +index d5a9a5f069..a4bd7348eb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -776,6 +776,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant getChunkAtAsync(int x, int z, boolean gen) { diff --git a/patches/server/0056-Players-should-not-cram-to-death.patch b/patches/server/0056-Players-should-not-cram-to-death.patch index beb82bd27..0f9a5e2f8 100644 --- a/patches/server/0056-Players-should-not-cram-to-death.patch +++ b/patches/server/0056-Players-should-not-cram-to-death.patch @@ -1,4 +1,4 @@ -From f0db1af8a2684f960674e4314a4e560eb492b015 Mon Sep 17 00:00:00 2001 +From 6f8989fe5f0b31e34732a75629fd21faf197287c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:01:46 -0500 Subject: [PATCH] Players should not cram to death @@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 20326f1907..68900c52a4 100644 +index 8c59692b2b..d375069f33 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1074,7 +1074,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1073,7 +1073,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isInvulnerable(DamageSource damagesource) { diff --git a/patches/server/0060-Implement-lagging-threshold.patch b/patches/server/0060-Implement-lagging-threshold.patch index 507353ac8..d22383d5c 100644 --- a/patches/server/0060-Implement-lagging-threshold.patch +++ b/patches/server/0060-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From cc1a5e544d859ccce9b4462070864188d13997b3 Mon Sep 17 00:00:00 2001 +From ff9f394de1b59c5f933c62674945088cca62b415 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Implement lagging threshold @@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold 3 files changed, 9 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c5e89790fc..bfd1a9a809 100644 +index a4bd7348eb..d1e8cb4f4c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant