Skip to content

Commit

Permalink
Fix Tracking Range mismatch on Vehicle/Passenger checks
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
aikar committed Apr 27, 2020
1 parent 68994c6 commit 10396d2
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e0a88576c7e8675a3d748dd802c0f2fde9be1652 Mon Sep 17 00:00:00 2001
From 0fb693f9d446eb0aaf739ea4c7b6743fb8fdc4b7 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Sat, 21 Dec 2019 15:22:09 -0500
Subject: [PATCH] Tracking Range Improvements
Expand All @@ -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
@@ -1734,6 +1734,7 @@ 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
@@ -1,6 +1,7 @@
Expand Down Expand Up @@ -60,5 +72,5 @@ index 6f8e6c1d..46c33e69 100644
}
}
--
2.25.1.windows.1
2.26.2

0 comments on commit 10396d2

Please sign in to comment.