diff --git a/Paper b/Paper index 7329e19ce..60d4c8085 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 7329e19ce5c470c7daed375aaef39ddf180d5720 +Subproject commit 60d4c80854f2c5db22c2ffe5c453cbce5b3de625 diff --git a/current-paper b/current-paper index 9affaf5bf..81d9c663b 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--833bebdb4653f254bf9680765742a5ebfbf2831b +1.15.2--27bf8c98d2538c432b62a8dda11aca4a26d47cb7 diff --git a/patches/server/0099-Remove-part-of-Paper-s-EAR-optimizations-until-they-.patch b/patches/server/0099-Remove-part-of-Paper-s-EAR-optimizations-until-they-.patch deleted file mode 100644 index 9f308ba08..000000000 --- a/patches/server/0099-Remove-part-of-Paper-s-EAR-optimizations-until-they-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 97aeba89498b4b8cdc64a54b37b81aa50bfa2cf8 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 26 Jan 2020 16:58:03 -0600 -Subject: [PATCH] Remove part of Paper's EAR optimizations until they fix - hasTasks() method - ---- - src/main/java/org/spigotmc/ActivationRange.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index da5fef091a..2c0f76e8c1 100644 ---- a/src/main/java/org/spigotmc/ActivationRange.java -+++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -286,12 +286,12 @@ public class ActivationRange - } - isActive = true; - // Paper start -- } else if (entity instanceof EntityInsentient && ((EntityInsentient) entity).targetSelector.hasTasks()) { -+ } else if (false && entity instanceof EntityInsentient && ((EntityInsentient) entity).targetSelector.hasTasks()) { // Purpur - remove targetSelector.hasTasks - isActive = true; - } - // Paper end - // Add a little performance juice to active entities. Skip 1/4 if not immune. -- } else if ( !entity.defaultActivationState && entity.ticksLived % 4 == 0 && !(entity instanceof EntityInsentient && ((EntityInsentient) entity).targetSelector.hasTasks()) && !checkEntityImmunities( entity ) ) // Paper - add targetSelector.hasTasks -+ } else if ( !entity.defaultActivationState && entity.ticksLived % 4 == 0 && !checkEntityImmunities( entity ) ) // Paper - add targetSelector.hasTasks // Purpur - remove targetSelector.hasTasks - { - isActive = false; - } --- -2.24.0 -