Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
60d4c808 Properly check for running tasks in EAR
This commit is contained in:
William Blake Galbreath
2020-01-26 18:00:18 -06:00
parent 3c92872520
commit 9465dbd9a5
3 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0099-Remove-part-of-Paper-s-EAR-optimizations-until-they-.patch
View File

@@ -1,32 +0,0 @@
From 97aeba89498b4b8cdc64a54b37b81aa50bfa2cf8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
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