Revert view distance tracking code

CitizensDev · May 12, 2020 · 5e2a7ef · 5e2a7ef
1 parent 0498353
commit 5e2a7ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -318,6 +318,9 @@ public boolean spawn(Location at, SpawnReason reason) {
     @Override
     public void teleport(Location location, TeleportCause reason) {
         super.teleport(location, reason);
+        if (isSpawned() && getEntity().getLocation(CACHE_LOCATION).distanceSquared(location) < 1) {
+            NMS.setHeadYaw(getEntity(), location.getYaw());
+        }
         if (getEntity() instanceof SkinnableEntity) {
             ((SkinnableEntity) getEntity()).getSkinTracker().updateNearbyViewers(48);
         }

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerlistTracker.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerlistTracker.java
@@ -67,7 +67,7 @@ public void updatePlayer(final EntityPlayer entityplayer) {
             return; // prevent updates to NPC "viewers"
         Entity tracker = getTracker(this);
         final Vec3D vec3d = new Vec3D(entityplayer.locX, entityplayer.locY, entityplayer.locZ).d(this.trackerEntry.b());
-        final int i = Math.max(this.trackingDistance, (getViewDistance(map) - 1) * 16);
+        final int i = Math.min(this.trackingDistance, (getViewDistance(map) - 1) * 16);
         final boolean flag = vec3d.x >= -i && vec3d.x <= i && vec3d.z >= -i && vec3d.z <= i
                 && this.tracker.a(entityplayer);
         if (entityplayer != tracker && flag && tracker instanceof SkinnableEntity) {

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java
@@ -68,7 +68,7 @@ public void updatePlayer(final EntityPlayer entityplayer) {
         Entity tracker = getTracker(this);
         final Vec3D vec3d = new Vec3D(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ())
                 .d(this.trackerEntry.b());
-        final int i = Math.max(this.trackingDistance, (getViewDistance(map) - 1) * 16);
+        final int i = Math.min(this.trackingDistance, (getViewDistance(map) - 1) * 16);
         final boolean flag = vec3d.x >= -i && vec3d.x <= i && vec3d.z >= -i && vec3d.z <= i
                 && this.tracker.a(entityplayer);
         if (entityplayer != tracker && flag && tracker instanceof SkinnableEntity) {
@@ -80,15 +80,13 @@ public void updatePlayer(final EntityPlayer entityplayer) {
                     flag1 = getb(chunkcoordintpair, entityplayer, false) <= getViewDistance(map);
                 }
             }*/
-
             if (!this.trackedPlayers.contains(entityplayer)) {
                 SkinnableEntity skinnable = (SkinnableEntity) tracker;
 
                 Player player = skinnable.getBukkitEntity();
-                if (!entityplayer.getBukkitEntity().canSee(player))
-                    return;
-
-                skinnable.getSkinTracker().updateViewer(entityplayer.getBukkitEntity());
+                if (entityplayer.getBukkitEntity().canSee(player)) {
+                    skinnable.getSkinTracker().updateViewer(entityplayer.getBukkitEntity());
+                }
             }
         }
         super.updatePlayer(entityplayer);