From c0e748c0c1dac43209d35d4b642b743b17b31514 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Apr 2020 16:29:21 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 68994c64 Add a config to turn off Optimized TickList #3145 d847d336 Improve blocking players from opening inventories while sleeping ac4f6b50 Clean up Timings and Async Chunk Configs fcf89e85 Improve mid tick chunk loading, Fix Oversleep, other improvements ab36835c Improve random ticking behaviour - Fixes #3181 --- Paper | 2 +- current-paper | 2 +- patches/server/0001-Rebrand.patch | 18 +++++++++--------- .../0014-Zombie-horse-naturally-spawn.patch | 8 ++++---- patches/server/0037-Implement-AFK-API.patch | 10 +++++----- patches/server/0042-Make-the-GUI-better.patch | 6 +++--- .../0047-Implement-lagging-threshold.patch | 6 +++--- .../0098-Configurable-server-mod-name.patch | 6 +++--- patches/server/0104-Optimize-Chunk-Ticks.patch | 8 ++++---- .../server/0106-Add-more-timings-timers.patch | 8 ++++---- ...able-to-execute-tasks-on-the-main-ser.patch | 6 +++--- .../0119-YAPFA-Disable-mojang-profiler.patch | 8 ++++---- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Paper b/Paper index a6ac47e50..68994c64e 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit a6ac47e502d4cadef0c2c289956971739076c49c +Subproject commit 68994c64ec03b557bf244df2b3a9ad3810aec550 diff --git a/current-paper b/current-paper index 6eab82aeb..516ab17ee 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--167bedd58018498c1428e97ea328d4d61f5e7e7a +1.15.2--73d4a9197286e07b101b41db39a9f0f6ff7d9a84 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 93922835f..1a5bd98a1 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From fdfa08dc4c29c6f1b999c5089b075172cd87ac00 Mon Sep 17 00:00:00 2001 +From 935889653a8c30f88b6df8e688115f955b4dcde8 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 55679af9..a7ee9396 100644 +index 55679af92..a7ee9396a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -94,7 +94,7 @@ index 55679af9..a7ee9396 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index cd6e2592..bb227bc0 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 { @@ -107,10 +107,10 @@ index cd6e2592..bb227bc0 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1086d1ca..fc5ded95 100644 +index 98f039834..3bd3e5044 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1532,7 +1532,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 7 Jul 2019 19:52:16 -0500 Subject: [PATCH] Zombie horse naturally spawn @@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 84a3367b87..7d9e61a82d 100644 +index d13dc8fce..fc3a41e35 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -586,12 +586,18 @@ public class WorldServer extends World { +@@ -597,12 +597,18 @@ public class WorldServer extends World { boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper if (flag1) { @@ -38,7 +38,7 @@ index 84a3367b87..7d9e61a82d 100644 this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 96a66926fc..4c7469b903 100644 +index 96a66926f..4c7469b90 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -657,9 +657,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0037-Implement-AFK-API.patch b/patches/server/0037-Implement-AFK-API.patch index c19adcc86..9c0027ac6 100644 --- a/patches/server/0037-Implement-AFK-API.patch +++ b/patches/server/0037-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From e1030e6d994303fd20f00b1729315ed0246d0985 Mon Sep 17 00:00:00 2001 +From 4788da0f8b7426b22c442457a2259c85b151b02a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] Implement AFK API @@ -50,7 +50,7 @@ index 16ccabfd5..5ac3c4641 100644 super(EntityTypes.PLAYER, world); this.bV = ItemStack.a; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 51933a490..a021c111c 100644 +index ea5dc1c4e..a99eb77b0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1622,8 +1622,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -206,10 +206,10 @@ index 3c37d032c..c1a4697ae 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fe81529a9..9b8739485 100644 +index fc3a41e35..c85639e48 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -393,7 +393,7 @@ public class WorldServer extends World { +@@ -405,7 +405,7 @@ public class WorldServer extends World { } if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> { @@ -218,7 +218,7 @@ index fe81529a9..9b8739485 100644 })) { // CraftBukkit start long l = this.worldData.getDayTime() + 24000L; -@@ -714,7 +714,7 @@ public class WorldServer extends World { +@@ -723,7 +723,7 @@ public class WorldServer extends World { while (iterator.hasNext()) { EntityPlayer entityplayer = (EntityPlayer) iterator.next(); diff --git a/patches/server/0042-Make-the-GUI-better.patch b/patches/server/0042-Make-the-GUI-better.patch index 0a5e99e5c..239e84c81 100644 --- a/patches/server/0042-Make-the-GUI-better.patch +++ b/patches/server/0042-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From ef4c4982128b5370f583b664de07687d5bf73530 Mon Sep 17 00:00:00 2001 +From b14034a9f9af83c9873e567ebbe6bb8626abb7a7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 16 Jan 2020 14:59:16 -0600 Subject: [PATCH] Make the GUI better @@ -88,10 +88,10 @@ index 018def64a..fe474e4eb 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fc5ded953..bf8461ea6 100644 +index 3bd3e5044..8207e7f8a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1339,6 +1339,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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, 14 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bf8461ea6..8e46749e3 100644 +index 8207e7f8a..4d25bd747 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 21 Mar 2020 11:47:39 -0500 Subject: [PATCH] Configurable server mod name @@ -9,10 +9,10 @@ Subject: [PATCH] Configurable server mod name 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1b27382c6..f7c82f519 100644 +index 971466e2a..1b76ce463 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1550,7 +1550,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 2 Apr 2020 00:28:06 -0500 Subject: [PATCH] Optimize Chunk Ticks @@ -10,7 +10,7 @@ Subject: [PATCH] Optimize Chunk Ticks 3 files changed, 51 insertions(+), 63 deletions(-) diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 2d4d7250f..b7dadb1b9 100644 +index 78a8a3cc6..0a09e8dd7 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -737,11 +737,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -135,10 +135,10 @@ index 3ed7fa324..7f236585d 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index ee0cabadc..5b9647c85 100644 +index c1a036e88..5f482208e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -1371,28 +1371,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1386,28 +1386,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) { diff --git a/patches/server/0106-Add-more-timings-timers.patch b/patches/server/0106-Add-more-timings-timers.patch index 0b0d2a094..af6907084 100644 --- a/patches/server/0106-Add-more-timings-timers.patch +++ b/patches/server/0106-Add-more-timings-timers.patch @@ -1,4 +1,4 @@ -From 61ba4cfbcbc576de5c1be2698d96cc20495b23f3 Mon Sep 17 00:00:00 2001 +From 1e9e1b0a650d5d777278516091495530cd0b0a7d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 02:36:45 -0500 Subject: [PATCH] Add more timings timers @@ -12,7 +12,7 @@ Subject: [PATCH] Add more timings timers 5 files changed, 56 insertions(+) diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 434833d50..cb27ed36e 100644 +index 37341d2d2..918eaf0c6 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -43,6 +43,28 @@ public final class MinecraftTimings { @@ -206,10 +206,10 @@ index 90319909e..ab51ef429 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e1387ddce..4e513c3b8 100644 +index 43535c38a..7298b41ca 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -833,7 +833,9 @@ public class WorldServer extends World { +@@ -842,7 +842,9 @@ public class WorldServer extends World { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); gameprofilerfiller.c("tickPassenger"); diff --git a/patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch index 0b4766570..32bb077ba 100644 --- a/patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch +++ b/patches/server/0118-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch @@ -1,4 +1,4 @@ -From da871a180dfc54739fff08a9cbdcbd3be8a5b974 Mon Sep 17 00:00:00 2001 +From 3d7a3fe532407b0711763e320060afd9bd30a550 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 3 Apr 2020 02:21:13 -0700 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server @@ -12,10 +12,10 @@ chunks. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5606e080f..b27d1389a 100644 +index e9f1fd78a..1ba86d12f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1085,7 +1085,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] YAPFA - Disable mojang profiler @@ -43,7 +43,7 @@ index f0d72ea39..e38a68406 100644 throw CommandDebug.b.create(); } else { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b27d1389a..e61740eb1 100644 +index 1ba86d12f..2f58c3b44 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant