From 2243be451388b0116b8c0485c04c9c178d410649 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 Apr 2020 17:33:46 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: c096fe19 Port 20w15a Villager AI optimizations 832687de Restore preventing saving bad entities patch to full effect df8eedee Restore Optimize Pathfinding patch 97b1cc36 Allow shutting down server during a watchdog hang gracefully 06044e24 Async command map building --- Paper | 2 +- current-paper | 2 +- ...c-support-for-PlayerCommandSendEvent.patch | 25 -------- patches/server/0001-Rebrand.patch | 6 +- patches/server/0044-Make-the-GUI-better.patch | 6 +- .../0049-Implement-lagging-threshold.patch | 6 +- ...0068-Add-5-second-tps-average-in-tps.patch | 8 +-- .../0089-UPnP-Port-Forwarding-Service.patch | 13 ++-- patches/server/0098-Add-ping-command.patch | 6 +- .../0100-Configurable-server-mod-name.patch | 6 +- .../0102-Configurable-TPS-Catchup.patch | 6 +- ...-Skip-events-if-there-s-no-listeners.patch | 18 +++--- ...1-Async-recalc-perms-and-command-map.patch | 55 ----------------- ...ays-increment-arrow-despawn-counter.patch} | 2 +- ...72-Fix-Add-turtle-egg-block-options.patch} | 2 +- ... 0113-MC-4-Fix-Item-position-desync.patch} | 4 +- ...0114-MC-56653-Fix-pig-zombies-aggro.patch} | 2 +- ...h => 0115-EMC-MonsterEggSpawn-Event.patch} | 2 +- ...h => 0116-PaperPR-Add-BellRingEvent.patch} | 2 +- .../0117-EMC-Optimize-Pathfinding.patch | 59 ------------------- ...0117-PaperPR-Per-World-Spawn-limits.patch} | 2 +- ...=> 0118-Tuinity-Delay-chunk-unloads.patch} | 10 ++-- ...-entity-collision-code-if-not-neede.patch} | 2 +- ...le-to-execute-tasks-on-the-main-ser.patch} | 6 +- ... 0121-YAPFA-Disable-mojang-profiler.patch} | 8 +-- ...atch => 0122-Chickens-can-retaliate.patch} | 2 +- 26 files changed, 62 insertions(+), 200 deletions(-) delete mode 100644 patches/api/0033-Async-support-for-PlayerCommandSendEvent.patch delete mode 100644 patches/server/0111-Async-recalc-perms-and-command-map.patch rename patches/server/{0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch => 0111-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch} (96%) rename patches/server/{0113-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0112-MC-168772-Fix-Add-turtle-egg-block-options.patch} (97%) rename patches/server/{0114-MC-4-Fix-Item-position-desync.patch => 0113-MC-4-Fix-Item-position-desync.patch} (97%) rename patches/server/{0115-MC-56653-Fix-pig-zombies-aggro.patch => 0114-MC-56653-Fix-pig-zombies-aggro.patch} (98%) rename patches/server/{0116-EMC-MonsterEggSpawn-Event.patch => 0115-EMC-MonsterEggSpawn-Event.patch} (98%) rename patches/server/{0118-PaperPR-Add-BellRingEvent.patch => 0116-PaperPR-Add-BellRingEvent.patch} (97%) delete mode 100644 patches/server/0117-EMC-Optimize-Pathfinding.patch rename patches/server/{0119-PaperPR-Per-World-Spawn-limits.patch => 0117-PaperPR-Per-World-Spawn-limits.patch} (97%) rename patches/server/{0120-Tuinity-Delay-chunk-unloads.patch => 0118-Tuinity-Delay-chunk-unloads.patch} (97%) rename patches/server/{0121-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch => 0119-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch} (96%) rename patches/server/{0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch => 0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch} (85%) rename patches/server/{0123-YAPFA-Disable-mojang-profiler.patch => 0121-YAPFA-Disable-mojang-profiler.patch} (96%) rename patches/server/{0124-Chickens-can-retaliate.patch => 0122-Chickens-can-retaliate.patch} (98%) diff --git a/Paper b/Paper index a4f066cce..c096fe19f 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit a4f066ccea069da8ff950ecf52e42e20234f41df +Subproject commit c096fe19fa07bebcd78b25ee6b84f62f45d64e19 diff --git a/current-paper b/current-paper index ac624dfd7..7ed0279ab 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--fa4549a5b3af14f60ddc6ff880cb804c6166f4f9 +1.15.2--a4f180fd6c00f10e373da363dc80e7c2f67756ad diff --git a/patches/api/0033-Async-support-for-PlayerCommandSendEvent.patch b/patches/api/0033-Async-support-for-PlayerCommandSendEvent.patch deleted file mode 100644 index bacc8d373..000000000 --- a/patches/api/0033-Async-support-for-PlayerCommandSendEvent.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8ae43d0e8a4016625c43f34562c27132c02cb04d Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Wed, 8 Apr 2020 23:00:31 -0500 -Subject: [PATCH] Async support for PlayerCommandSendEvent - ---- - .../java/org/bukkit/event/player/PlayerCommandSendEvent.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java b/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java -index 762825997..749d304d4 100644 ---- a/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java -+++ b/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java -@@ -20,7 +20,7 @@ public class PlayerCommandSendEvent extends PlayerEvent { - private final Collection commands; - - public PlayerCommandSendEvent(@NotNull final Player player, @NotNull final Collection commands) { -- super(player); -+ super(player, !org.bukkit.Bukkit.isPrimaryThread()); // Purpur - this.commands = commands; - } - --- -2.24.0 - diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 9c44c7ed0..af5f47971 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 498a36be474c013abb9677f08f5d83e0ea160aa9 Mon Sep 17 00:00:00 2001 +From 00c8afb2ece0408c0d695b2b150a29fbc874c2ce 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 2686874f26..9f6d2eebbc 100644 +index a9b5337512..1675ae09c7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 16 Jan 2020 14:59:16 -0600 Subject: [PATCH] Make the GUI better @@ -88,10 +88,10 @@ index e614570d33..bd9c123d56 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9f6d2eebbc..11ba4a8c06 100644 +index 1675ae09c7..36dbef247d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1317,6 +1317,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 11ba4a8c06..6887c2ffd2 100644 +index 36dbef247d..3b1ad9d4f1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -183,6 +183,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 6887c2ffd2..1577308be6 100644 +index 3b1ad9d4f1..69970e0ab9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -182,7 +182,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service @@ -6,11 +6,11 @@ Subject: [PATCH] UPnP Port Forwarding Service --- pom.xml | 10 ++++ .../net/minecraft/server/DedicatedServer.java | 25 ++++++++++ - .../net/minecraft/server/MinecraftServer.java | 11 +++++ + .../net/minecraft/server/MinecraftServer.java | 12 +++++ .../java/net/pl3x/purpur/PurpurConfig.java | 5 ++ .../net/pl3x/purpur/gui/info/JInfoPanel.java | 3 ++ .../pl3x/purpur/gui/info/UPnPComponent.java | 47 +++++++++++++++++++ - 6 files changed, 101 insertions(+) + 6 files changed, 102 insertions(+) create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java diff --git a/pom.xml b/pom.xml @@ -78,7 +78,7 @@ index bd9c123d56..7e8286b573 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 1577308be6..2a3b4f309c 100644 +index 69970e0ab9..fab3e3d784 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -186,6 +186,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 13 Mar 2020 22:29:10 -0500 Subject: [PATCH] Add /ping command @@ -30,7 +30,7 @@ index 39a6a9ac00..5568649b7e 100644 List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 37b1a7947c..b38a5223cb 100644 +index 2414b0a552..6a755df64f 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -30,7 +30,7 @@ import org.bukkit.event.server.ServerCommandEvent; @@ -50,7 +50,7 @@ index 37b1a7947c..b38a5223cb 100644 } this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> { -@@ -315,10 +316,12 @@ public class CommandDispatcher { +@@ -330,10 +331,12 @@ public class CommandDispatcher { } diff --git a/patches/server/0100-Configurable-server-mod-name.patch b/patches/server/0100-Configurable-server-mod-name.patch index 83e8acb02..1aa9aa3ea 100644 --- a/patches/server/0100-Configurable-server-mod-name.patch +++ b/patches/server/0100-Configurable-server-mod-name.patch @@ -1,4 +1,4 @@ -From 09e58e194d78c13e0a8749307549b16afca28dda Mon Sep 17 00:00:00 2001 +From 9812b682d24b4bca2bc822d9fa27d6f2ca5f7a9b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath 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 2a3b4f309c..b7e0e0a977 100644 +index fab3e3d784..e3c326c340 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1529,7 +1529,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 b7e0e0a977..b6da0884cd 100644 +index e3c326c340..cebb45ec76 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -959,6 +959,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 4 Apr 2020 03:07:59 -0500 Subject: [PATCH] Skip events if there's no listeners @@ -8,18 +8,18 @@ Subject: [PATCH] Skip events if there's no listeners 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index b38a5223cb..ca701a2e68 100644 +index 6a755df64f..5ece5c4eeb 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java -@@ -255,6 +255,7 @@ public class CommandDispatcher { - map.put(this.b.getRoot(), rootcommandnode); - this.a(this.b.getRoot(), rootcommandnode, entityplayer.getCommandListener(), (Map) map); +@@ -274,6 +274,7 @@ public class CommandDispatcher { + } + private void runSync(EntityPlayer entityplayer, Collection bukkit, RootCommandNode rootcommandnode) { + if (PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - skip all this crap if there's nothing listening - Collection bukkit = new LinkedHashSet<>(); - for (CommandNode node : rootcommandnode.getChildren()) { - bukkit.add(node.getName()); -@@ -270,6 +271,7 @@ public class CommandDispatcher { + // Paper end - Async command map building + PlayerCommandSendEvent event = new PlayerCommandSendEvent(entityplayer.getBukkitEntity(), new LinkedHashSet<>(bukkit)); + event.getPlayer().getServer().getPluginManager().callEvent(event); +@@ -285,6 +286,7 @@ public class CommandDispatcher { } } // CraftBukkit end diff --git a/patches/server/0111-Async-recalc-perms-and-command-map.patch b/patches/server/0111-Async-recalc-perms-and-command-map.patch deleted file mode 100644 index f38fc042b..000000000 --- a/patches/server/0111-Async-recalc-perms-and-command-map.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 89cadb880367ca553254aaee8372031eaa1eef5b Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Wed, 8 Apr 2020 23:01:20 -0500 -Subject: [PATCH] Async recalc perms and command map - ---- - src/main/java/net/minecraft/server/PlayerList.java | 10 ++++++++++ - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 2 files changed, 15 insertions(+) - -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0d985b83d8..e0004fb644 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -760,6 +760,15 @@ public abstract class PlayerList { - GameProfile gameprofile = entityplayer.getProfile(); - int i = this.server.b(gameprofile); - -+ // Purpur start -+ if (net.pl3x.purpur.PurpurConfig.updatePermsAndCommandsAsync) { -+ java.util.concurrent.ForkJoinPool.commonPool().execute(new java.util.concurrent.RecursiveAction() { -+ protected void compute() { -+ recalculatePermsAndCommands(entityplayer, i); -+ } -+ }); -+ } else -+ // Purpur end - this.a(entityplayer, i); - } - -@@ -893,6 +902,7 @@ public abstract class PlayerList { - - } - -+ private void recalculatePermsAndCommands(EntityPlayer entityplayer, int i) { a(entityplayer, i); } // Purpur - OBFHELPER - private void a(EntityPlayer entityplayer, int i) { - if (entityplayer.playerConnection != null) { - byte b0; -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index e09cc77785..9ef407f346 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -208,4 +208,9 @@ public class PurpurConfig { - enchantment.setMaxLevel(maxLevel); - } - } -+ -+ public static boolean updatePermsAndCommandsAsync = false; -+ private static void updatePermsAndCommandsAsync() { -+ updatePermsAndCommandsAsync = getBoolean("settings.update-permissions-and-commands-async", updatePermsAndCommandsAsync); -+ } - } --- -2.24.0 - diff --git a/patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0111-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch similarity index 96% rename from patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch rename to patches/server/0111-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch index 0d622babe..85c90d07d 100644 --- a/patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch +++ b/patches/server/0111-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch @@ -1,4 +1,4 @@ -From 2758492060717405c630dcd65a289920a0e4a473 Mon Sep 17 00:00:00 2001 +From ab235395d56c2b8ae83599445292048d56a53f4a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter diff --git a/patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0112-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 97% rename from patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0112-MC-168772-Fix-Add-turtle-egg-block-options.patch index 2f6b95411..2c3416cbc 100644 --- a/patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0112-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -1,4 +1,4 @@ -From 23d28155773440b58ca0dafe292b65252082ebfa Mon Sep 17 00:00:00 2001 +From c94ced1b3813a118ca16c31c494f0e96bb443981 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 22:15:46 -0500 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options diff --git a/patches/server/0114-MC-4-Fix-Item-position-desync.patch b/patches/server/0113-MC-4-Fix-Item-position-desync.patch similarity index 97% rename from patches/server/0114-MC-4-Fix-Item-position-desync.patch rename to patches/server/0113-MC-4-Fix-Item-position-desync.patch index 5e56c2ef9..2c1f8f0bd 100644 --- a/patches/server/0114-MC-4-Fix-Item-position-desync.patch +++ b/patches/server/0113-MC-4-Fix-Item-position-desync.patch @@ -1,4 +1,4 @@ -From ec96758f556e1a9ffb87bdad591fa22df602e952 Mon Sep 17 00:00:00 2001 +From 371180c7bd03220b71c7d8f260ad63677513521f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 21:12:58 -0500 Subject: [PATCH] MC-4 Fix - Item position desync @@ -44,7 +44,7 @@ index 5b1d959354..0010448e3a 100644 return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 9ef407f346..31c5eec50c 100644 +index e09cc77785..4d7795c938 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -167,8 +167,10 @@ public class PurpurConfig { diff --git a/patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch b/patches/server/0114-MC-56653-Fix-pig-zombies-aggro.patch similarity index 98% rename from patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch rename to patches/server/0114-MC-56653-Fix-pig-zombies-aggro.patch index 54ca06952..48523711e 100644 --- a/patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch +++ b/patches/server/0114-MC-56653-Fix-pig-zombies-aggro.patch @@ -1,4 +1,4 @@ -From 311ea9846ee3db629c705342683697ed85061215 Mon Sep 17 00:00:00 2001 +From 3e90adfb892fb2d30a5a6514a072d5a7f26f3653 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 9 Jul 2019 20:56:47 -0500 Subject: [PATCH] MC-56653 Fix - pig zombies aggro diff --git a/patches/server/0116-EMC-MonsterEggSpawn-Event.patch b/patches/server/0115-EMC-MonsterEggSpawn-Event.patch similarity index 98% rename from patches/server/0116-EMC-MonsterEggSpawn-Event.patch rename to patches/server/0115-EMC-MonsterEggSpawn-Event.patch index 3f6d1b09d..a2e904911 100644 --- a/patches/server/0116-EMC-MonsterEggSpawn-Event.patch +++ b/patches/server/0115-EMC-MonsterEggSpawn-Event.patch @@ -1,4 +1,4 @@ -From 91e0c05ca584782244fca7221d82f57abc807f99 Mon Sep 17 00:00:00 2001 +From 38ed9f144c5f3a2708c90cf6d39c4239f25ce82c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 20 Jul 2013 22:40:56 -0400 Subject: [PATCH] EMC - MonsterEggSpawn Event diff --git a/patches/server/0118-PaperPR-Add-BellRingEvent.patch b/patches/server/0116-PaperPR-Add-BellRingEvent.patch similarity index 97% rename from patches/server/0118-PaperPR-Add-BellRingEvent.patch rename to patches/server/0116-PaperPR-Add-BellRingEvent.patch index e55175760..258a03dda 100644 --- a/patches/server/0118-PaperPR-Add-BellRingEvent.patch +++ b/patches/server/0116-PaperPR-Add-BellRingEvent.patch @@ -1,4 +1,4 @@ -From 4c189c0f6cf26cc3fa4a21faf9a7f05b67c67847 Mon Sep 17 00:00:00 2001 +From e77e28eb11bf9f6130204cfe37657236a0016721 Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Mon, 24 Jun 2019 21:27:32 -0700 Subject: [PATCH] PaperPR - Add BellRingEvent diff --git a/patches/server/0117-EMC-Optimize-Pathfinding.patch b/patches/server/0117-EMC-Optimize-Pathfinding.patch deleted file mode 100644 index 415024fbb..000000000 --- a/patches/server/0117-EMC-Optimize-Pathfinding.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f25a1e4b5ec346d76d1bae86faa9a3bf6905b240 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Thu, 3 Mar 2016 02:02:07 -0600 -Subject: [PATCH] EMC - Optimize Pathfinding - -Prevents pathfinding from spamming failures for things such as -arrow attacks. ---- - .../minecraft/server/NavigationAbstract.java | 24 +++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index f06764973f..ac29f89371 100644 ---- a/src/main/java/net/minecraft/server/NavigationAbstract.java -+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java -@@ -11,7 +11,7 @@ public abstract class NavigationAbstract { - protected final EntityInsentient a; public Entity getEntity() { return a; } // Paper - OBFHELPER - protected final World b; - @Nullable -- protected PathEntity c; -+ protected PathEntity c; protected final PathEntity getCurrentPath() { return this.c; } // Purpur - OBFHELPER - protected double d; - private final AttributeInstance p; - protected int e; -@@ -158,10 +158,30 @@ public abstract class NavigationAbstract { - return this.a(this.a(d0, d1, d2, 1), d3); - } - -+ // Purpur start - optimise pathfinding -+ private int lastFailure = 0; -+ private int pathfindFailures = 0; -+ // Purpur end -+ - public boolean a(Entity entity, double d0) { -+ // Purpur start - Pathfinding optimizations -+ if (this.pathfindFailures > 10 && this.getCurrentPath() == null && MinecraftServer.currentTick < this.lastFailure + 40) { -+ return false; -+ } -+ // Purpur end - PathEntity pathentity = this.a(entity, 1); - -- return pathentity != null && this.a(pathentity, d0); -+ // Purpur start - Pathfinding optimizations -+ if (pathentity != null && this.a(pathentity, d0)) { -+ this.lastFailure = 0; -+ this.pathfindFailures = 0; -+ return true; -+ } else { -+ this.pathfindFailures++; -+ this.lastFailure = MinecraftServer.currentTick; -+ return false; -+ } -+ // Purpur end - } - - public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER --- -2.24.0 - diff --git a/patches/server/0119-PaperPR-Per-World-Spawn-limits.patch b/patches/server/0117-PaperPR-Per-World-Spawn-limits.patch similarity index 97% rename from patches/server/0119-PaperPR-Per-World-Spawn-limits.patch rename to patches/server/0117-PaperPR-Per-World-Spawn-limits.patch index fc847fbee..12f647376 100644 --- a/patches/server/0119-PaperPR-Per-World-Spawn-limits.patch +++ b/patches/server/0117-PaperPR-Per-World-Spawn-limits.patch @@ -1,4 +1,4 @@ -From 2565c9b3ba85972d51fc4b9c30a815cfa04f2a83 Mon Sep 17 00:00:00 2001 +From fbb2cbda6e3695eb4c43f498934da285239fa2b6 Mon Sep 17 00:00:00 2001 From: chase Date: Sun, 15 Mar 2020 18:32:22 -0600 Subject: [PATCH] PaperPR - Per World Spawn limits diff --git a/patches/server/0120-Tuinity-Delay-chunk-unloads.patch b/patches/server/0118-Tuinity-Delay-chunk-unloads.patch similarity index 97% rename from patches/server/0120-Tuinity-Delay-chunk-unloads.patch rename to patches/server/0118-Tuinity-Delay-chunk-unloads.patch index ce32ad509..109124744 100644 --- a/patches/server/0120-Tuinity-Delay-chunk-unloads.patch +++ b/patches/server/0118-Tuinity-Delay-chunk-unloads.patch @@ -1,4 +1,4 @@ -From 268092bc3630f2ac33f396e0f0d4ddc8f3cf4ede Mon Sep 17 00:00:00 2001 +From a1a3f45960afdad2059d354176839c28b10ddc0c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 25 Oct 2019 02:11:30 -0700 Subject: [PATCH] Tuinity - Delay chunk unloads @@ -185,7 +185,7 @@ index 4b87ca2ecb..346e2ebc79 100644 public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 31c5eec50c..66258ea47b 100644 +index 4d7795c938..a13cb072ba 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -4,6 +4,7 @@ import com.google.common.base.Throwables; @@ -196,9 +196,9 @@ index 31c5eec50c..66258ea47b 100644 import net.pl3x.purpur.command.PurpurCommand; import org.bukkit.Bukkit; import org.bukkit.command.Command; -@@ -215,4 +216,12 @@ public class PurpurConfig { - private static void updatePermsAndCommandsAsync() { - updatePermsAndCommandsAsync = getBoolean("settings.update-permissions-and-commands-async", updatePermsAndCommandsAsync); +@@ -210,4 +211,12 @@ public class PurpurConfig { + enchantment.setMaxLevel(maxLevel); + } } + + public static int delayChunkUnloadsBy; diff --git a/patches/server/0121-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch b/patches/server/0119-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch similarity index 96% rename from patches/server/0121-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch rename to patches/server/0119-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch index 28aac8de4..672f1e534 100644 --- a/patches/server/0121-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch +++ b/patches/server/0119-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch @@ -1,4 +1,4 @@ -From 4b2a8e61e9f9db64d47aa834a7781e76137480c8 Mon Sep 17 00:00:00 2001 +From 249a6ce53535798d8b0e0064a6f390f9dde36098 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 26 Mar 2020 18:34:18 -0700 Subject: [PATCH] Tuinity - Don't run entity collision code if not needed diff --git a/patches/server/0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch similarity index 85% rename from patches/server/0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch rename to patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch index 92d68d4f9..2e6bc870e 100644 --- a/patches/server/0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch +++ b/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch @@ -1,4 +1,4 @@ -From b59a3ec5facc9721fee2c2bdb3325249efcc9f44 Mon Sep 17 00:00:00 2001 +From 53a11c80d9489ac8ef1f4c6e046e79ddda889c15 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 b6da0884cd..1ef77fbd31 100644 +index cebb45ec76..157bb1f9c4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1068,7 +1068,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 1ef77fbd31..31c71e46a3 100644 +index 157bb1f9c4..8724bae64b 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, 12 Apr 2020 13:19:34 -0500 Subject: [PATCH] Chickens can retaliate