diff --git a/Paper b/Paper index 225484cce..34e5942bf 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 225484ccef3a0b85989e4cd932567d2910cc1757 +Subproject commit 34e5942bf0e7981226d5c280d85ee4ab17a17503 diff --git a/current-paper b/current-paper index f79b6b19f..64955d540 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--07455712db99a316b61d4fc3feaacae9c398bd25 +1.15.2--f1507da451593fc5580a991d5516a795ca627417 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index a5f7e68d9..5c3f7ac91 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From a7ce770713962d590d3f52703ad66ae10465a8a4 Mon Sep 17 00:00:00 2001 +From 80511018e34ec212cbcea76fa4b3a3748880bfa0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -107,10 +107,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 395e5034ea..d7e29a59de 100644 +index b853d50a4a..88333e3aeb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1561,7 +1561,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 854c97bddb..b65df63333 100644 +index 17289cf377..41179fe312 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -600,12 +600,18 @@ public class WorldServer extends World { +@@ -601,12 +601,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) { @@ -54,5 +54,5 @@ index 96a66926fc..4c7469b903 100644 public boolean zombiePigmanRidable = false; -- -2.24.0 +2.26.2 diff --git a/patches/server/0038-Implement-AFK-API.patch b/patches/server/0038-Implement-AFK-API.patch index 3e7f01c77..965a3bbf6 100644 --- a/patches/server/0038-Implement-AFK-API.patch +++ b/patches/server/0038-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From 742fb5171cd5cada47c66919b143981cc02598e9 Mon Sep 17 00:00:00 2001 +From 7da20b7f3bd17fd2432f48cb077c4370bb39492e 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 @@ -206,10 +206,10 @@ index 96161160bb..762aad378c 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 b65df63333..8018bf6dd8 100644 +index 41179fe312..e82d091746 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -408,7 +408,7 @@ public class WorldServer extends World { +@@ -409,7 +409,7 @@ public class WorldServer extends World { } if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> { @@ -218,7 +218,7 @@ index b65df63333..8018bf6dd8 100644 })) { // CraftBukkit start long l = this.worldData.getDayTime() + 24000L; -@@ -726,7 +726,7 @@ public class WorldServer extends World { +@@ -727,7 +727,7 @@ public class WorldServer extends World { while (iterator.hasNext()) { EntityPlayer entityplayer = (EntityPlayer) iterator.next(); @@ -299,5 +299,5 @@ index 7125c0477e..e925e1374d 100644 + "idle.timeout.broadcast.back": "§e§o%s is no longer AFK" } -- -2.24.0 +2.26.2 diff --git a/patches/server/0043-Make-the-GUI-better.patch b/patches/server/0043-Make-the-GUI-better.patch index be68b3ae4..c11e455ba 100644 --- a/patches/server/0043-Make-the-GUI-better.patch +++ b/patches/server/0043-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From d758a1fb984a3aeab4c5c266153006a8c254028c Mon Sep 17 00:00:00 2001 +From 93bef04f9845d383a377947d578dd0a30a71ab31 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 cf5abd393e..73d2b32c5c 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d7e29a59de..d9407aedbf 100644 +index 88333e3aeb..1d22c2044d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1366,6 +1366,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant -- -2.24.0 +2.26.2 diff --git a/patches/server/0048-Implement-lagging-threshold.patch b/patches/server/0048-Implement-lagging-threshold.patch index 76165f4cb..6f62c0978 100644 --- a/patches/server/0048-Implement-lagging-threshold.patch +++ b/patches/server/0048-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From 27637e65736ed89d854c2693de7352528be84b84 Mon Sep 17 00:00:00 2001 +From 6f7af599f58e6e8229762aef1275a249201fd748 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, 14 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d9407aedbf..5baeb156e1 100644 +index 1d22c2044d..1b2bbb3460 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: Sun, 28 Jul 2019 01:27:37 -0500 Subject: [PATCH] Add 5 second tps average in /tps @@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5baeb156e1..426cde31a1 100644 +index 1b2bbb3460..fd9e8db0b6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -183,7 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service @@ -78,7 +78,7 @@ index 73d2b32c5c..a522ed5c36 100644 // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up server.loadPlugins(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 426cde31a1..50922dd367 100644 +index fd9e8db0b6..57acbbce17 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -187,6 +187,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 50922dd367..fb066bc10b 100644 +index 57acbbce17..c4f784f3d7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 26 Mar 2020 19:06:22 -0500 Subject: [PATCH] Configurable TPS Catchup @@ -9,10 +9,10 @@ Subject: [PATCH] Configurable TPS Catchup 2 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fb066bc10b..6d7e919495 100644 +index c4f784f3d7..13a3fab573 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -980,6 +980,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 84b1f068ad..fefc2433c6 100644 +index 48e1c50069..4949599b76 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 a68fc11ec6..4b277a6f6d 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3546424a1c..799dfdf696 100644 +index 81d233d23b..69102082f8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -845,7 +845,9 @@ public class WorldServer extends World { +@@ -846,7 +846,9 @@ public class WorldServer extends World { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); gameprofilerfiller.c("tickPassenger"); @@ -220,5 +220,5 @@ index 3546424a1c..799dfdf696 100644 } -- -2.24.0 +2.26.2 diff --git a/patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch index a9990dbbf..0997fd21c 100644 --- a/patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch +++ b/patches/server/0124-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch @@ -1,4 +1,4 @@ -From 276aed65a5bd72dc0027fbd4cc481a866d050d2d Mon Sep 17 00:00:00 2001 +From 0c7c76793aed4ba8f6fc011dd1c6911a62b660cb 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 6d7e919495..e02a7134a9 100644 +index 13a3fab573..565e3b72bb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1106,7 +1106,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 f0d72ea39d..e38a684060 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 e02a7134a9..10845ff8fd 100644 +index 565e3b72bb..d1c92c6984 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 Date: Sun, 7 Jun 2020 13:16:02 -0500 Subject: [PATCH] Do not strip colors from death messages @@ -8,7 +8,7 @@ Subject: [PATCH] Do not strip colors from death messages 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 90305b61fc..ffc849cd48 100644 +index 90305b61fc..0879f0904f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -610,7 +610,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -16,10 +16,10 @@ index 90305b61fc..ffc849cd48 100644 IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage(); - String deathmessage = defaultMessage.getString(); -+ String deathmessage = defaultMessage.getLegacyString(); ++ String deathmessage = defaultMessage.getLegacyString(); // Purpur org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); // Paper start - cancellable death event if (event.isCancelled()) { -- -2.24.0 +2.26.2