From 244841d9a345f67ed135ec1827c3764c084f91ac Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 27 Apr 2020 00:33:14 -0400 Subject: [PATCH] Fix Tracking Range mismatch on Vehicle/Passenger checks This was missing Entity Tracking Range support, creating different values in this section vs normal section. Concerned this might of caused some carnage on tracker if this code says "Yes you should track this player 500 blocks away from you on a horse" and then the other check uses the normal value. --- .../Tracking-Range-Improvements.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/Tracking-Range-Improvements.patch b/Spigot-Server-Patches/Tracking-Range-Improvements.patch index bd69ee39d..fe4d5907d 100644 --- a/Spigot-Server-Patches/Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/Tracking-Range-Improvements.patch @@ -7,8 +7,20 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code Also ignores Enderdragon, defaulting it to Mojang's setting +diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java +index a7b981f299..043ba702d7 100644 +--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java ++++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java +@@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { + while (iterator.hasNext()) { + Entity entity = (Entity) iterator.next(); + int j = entity.getEntityType().getChunkRange() * 16; ++ j = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, j); // Paper + + if (j > i) { + i = j; diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java -index 6f8e6c1d..46c33e69 100644 +index 6f8e6c1d07..46c33e6917 100644 --- a/src/main/java/org/spigotmc/TrackingRange.java +++ b/src/main/java/org/spigotmc/TrackingRange.java @@ -0,0 +0,0 @@