Fix incorrect tracking range bug causing entity tracking to not work
Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
This commit is contained in:
1 parent
61f4470f19
commit
a616e18488
3 files changed
+5
-7
No files matched your search
+2
-4
@@ -293,11 +293,9 @@ class EntityTypingHandler_1_14 extends EntityTypingHandler {
|
||||
* EntityTypes entitytypes = entity.getEntityType();
|
||||
* int i = entitytypes.getChunkRange() * 16;
|
||||
* #endif
|
||||
*
|
||||
* #if spigot
|
||||
*
|
||||
* i = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, i);
|
||||
* #endif
|
||||
*
|
||||
*
|
||||
* #if version >= 1.18
|
||||
* int j = entitytypes.updateInterval();
|
||||
* boolean trackDeltas = entitytypes.trackDeltas();
|
||||
|
||||
@@ -105,14 +105,14 @@ public class EntityTracker extends BasicWrapper<EntityTrackerHandle> {
|
||||
* @return previously set entity tracker entry, null if there was none
|
||||
*/
|
||||
public EntityTrackerEntryHandle setEntry(Entity entity, EntityTrackerEntryHandle entityTrackerEntry) {
|
||||
// On PaperSpigot, the entry is also stored in the entity itself
|
||||
// On Paper, the entry is also stored in the entity itself
|
||||
if (EntityHandle.T.tracker.isAvailable()) {
|
||||
EntityHandle.T.tracker.set(HandleConversion.toEntityHandle(entity), entityTrackerEntry);
|
||||
}
|
||||
|
||||
return handle.putEntry(entity.getEntityId(), entityTrackerEntry);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the entity tracker entry of an entity
|
||||
*
|
||||
|
||||
@@ -44,7 +44,7 @@ class Entity {
|
||||
protected (org.bukkit.entity.Entity) CraftEntity bukkitEntityField:bukkitEntity;
|
||||
#endif
|
||||
|
||||
optional (EntityTrackerEntryHandle) EntityTrackerEntry tracker;
|
||||
optional (EntityTrackerEntryHandle) net.minecraft.server.level.EntityTrackerEntry tracker;
|
||||
|
||||
#if version >= 1.17
|
||||
private static optional java.util.concurrent.atomic.AtomicInteger opt_atomic_entityCount:ENTITY_COUNTER;
|
||||
|
||||
Reference in new issue
Block a user