mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-16 08:57:05 +02:00
bbc31e2bd8
reporter of this issue was incorrect and did not verify vanilla logic vanilla logic only skips ticks if the flag is set spigots change causes bugs as it now skips ticking and processing chunk teleportation, which was a bug I fixed many many years ago...
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 6294e90434866ffbfed3843473bf3debeec37673 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 18 Apr 2018 01:42:42 -0400
|
|
Subject: [PATCH] Revert SPIGOT-3894 to restore vanilla behavior
|
|
|
|
reporter of this issue was incorrect and did not verify vanilla logic
|
|
|
|
vanilla logic only skips ticks if the flag is set
|
|
|
|
spigots change causes bugs as it now skips ticking and processing
|
|
chunk teleportation, which was a bug I fixed many many years ago...
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 4ce846b5e..6c92f93a9 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1754,7 +1754,7 @@ public abstract class World implements IBlockAccess {
|
|
// CraftBukkit end
|
|
|
|
// Spigot start
|
|
- if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
|
|
+ if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - Revert spigot change back to vanilla
|
|
entity.ticksLived++;
|
|
entity.inactiveTick();
|
|
return;
|
|
--
|
|
2.17.0
|
|
|