Relocate Timings v2 patch

2016-03-24 21:59:37 -07:00
parent 5dc69ba6e1
commit fc2341a996
11 changed files with 78 additions and 76 deletions
--- a/Spigot-Server-Patches/EAR-Fix-bug-with-teleporting-entities.patch
+++ b/Spigot-Server-Patches/EAR-Fix-bug-with-teleporting-entities.patch
@@ -36,12 +36,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +0,0 @@ public class ActivationRange
-         SpigotTimings.checkIfActiveTimer.startTiming();
+     {
         // Never safe to skip fireworks or entities not yet added to chunk
         // PAIL: inChunk
 -        if ( !entity.aa || entity instanceof EntityFireworks ) {
 +        if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) { // Paper - EAR: Fix bug with teleporting entities
-             SpigotTimings.checkIfActiveTimer.stopTiming();
             return true;
         }
+ 
 --