diff --git a/Paper b/Paper index cc477e6ab..a6ff84add 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit cc477e6abb7dfb1697296bc6191ca8993d248613 +Subproject commit a6ff84add7322f33e4611bb4bb63ec366ae632b5 diff --git a/current-paper b/current-paper index 386a55ca0..11b56063b 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--2bfa820e227768fa937f45494564265a51b4c6e2 +1.15.2--71d8d9b1520d9af29fe86461f959e208dac6c9c6 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 6ad342e25..8e079f8a7 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 83354a397f8da9106fa538b50ae6a182722db15d Mon Sep 17 00:00:00 2001 +From 3137c64676b0170b7984033742e003bee6247542 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 cd6e25923..bb227bc0f 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b952e9efa..89afe0933 100644 +index 1a4bc9043..9c96994f2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1544,7 +1544,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 6 Feb 2020 19:53:59 -0600 Subject: [PATCH] Ridables --- - .../paper/entity/ai/MobGoalHelper.java | 7 + + .../paper/entity/ai/MobGoalHelper.java | 5 + .../net/minecraft/server/AxisAlignedBB.java | 2 + .../server/ControllerLookDolphin.java | 4 +- .../net/minecraft/server/ControllerMove.java | 6 +- @@ -104,7 +104,7 @@ Subject: [PATCH] Ridables .../pathfinder/PathfinderGoalHasRider.java | 21 + .../craftbukkit/entity/CraftEntity.java | 27 + src/main/resources/purpur.lang | 4 +- - 100 files changed, 3629 insertions(+), 213 deletions(-) + 100 files changed, 3627 insertions(+), 211 deletions(-) create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java @@ -115,10 +115,10 @@ Subject: [PATCH] Ridables create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index d6ee94107..e8e0b3d25 100644 +index d6ee94107..0ab87b458 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -@@ -118,6 +118,13 @@ public class MobGoalHelper { +@@ -118,6 +118,11 @@ public class MobGoalHelper { ignored.add("selector_1"); ignored.add("selector_2"); ignored.add("wrapped"); @@ -126,25 +126,10 @@ index d6ee94107..e8e0b3d25 100644 + ignored.add("horse_abstract_1"); + ignored.add("llama_3"); + ignored.add("llama_4"); -+ ignored.add("find_crystal_goal"); -+ ignored.add("orbit_crystal_goal"); + // Purpur end bukkitMap.put(EntityInsentient.class, Mob.class); bukkitMap.put(EntityAgeable.class, Ageable.class); -diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index e8e0b3d2..0ab87b45 100644 ---- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -@@ -122,8 +122,6 @@ public class MobGoalHelper { - ignored.add("horse_abstract_1"); - ignored.add("llama_3"); - ignored.add("llama_4"); -- ignored.add("find_crystal_goal"); -- ignored.add("orbit_crystal_goal"); - // Purpur end - - bukkitMap.put(EntityInsentient.class, Mob.class); diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java index 3fdb52007..7e67292c2 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java diff --git a/patches/server/0042-Make-the-GUI-better.patch b/patches/server/0042-Make-the-GUI-better.patch index 9edfd3cd6..433bd2549 100644 --- a/patches/server/0042-Make-the-GUI-better.patch +++ b/patches/server/0042-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From 30c61bc04a59a9312d587f60881a58f9703c032a Mon Sep 17 00:00:00 2001 +From 566ac634b6c6db3e101070eaef5a7e851ef4b303 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 @@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 018def64a..fe474e4eb 100644 +index cf5abd393..73d2b32c5 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository; @@ -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 89afe0933..a8d572aa4 100644 +index 9c96994f2..6b6439493 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1351,6 +1351,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 a8d572aa4..533230432 100644 +index 6b6439493..d8822c29f 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 533230432..493d9efe6 100644 +index d8822c29f..e06c0bb39 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 @@ -42,7 +42,7 @@ index 6ca410444..46101cdbe 100644 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index fe474e4eb..18fdaf53e 100644 +index 73d2b32c5..a522ed5c3 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -78,7 +78,7 @@ index fe474e4eb..18fdaf53e 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 493d9efe6..f6260c34b 100644 +index e06c0bb39..28fefa0ca 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 f6260c34b..6e1d698af 100644 +index 28fefa0ca..142633ddb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1562,7 +1562,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 6e1d698af..902a5f98f 100644 +index 142633ddb..8aed5ff43 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -965,6 +965,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 902a5f98f..23f2da8a8 100644 +index 8aed5ff43..606e8dd97 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1091,7 +1091,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 23f2da8a8..a1905366f 100644 +index 606e8dd97..616dcbf7f 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