2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in atomicint/apollo (pull request #3)

Browse Source 
Fixes #17
This commit is contained in:
Ryley Kimmel
2015-04-21 20:02:03 -04:00
parent 1390da0d0f fad1936ff6
commit bacb708d26
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/game/sync/task/NpcSynchronizationTask.java
+2 -2
View File
@@ -49,7 +49,7 @@ public final class NpcSynchronizationTask extends SynchronizationTask {
for (Iterator<Npc> it = localNpcs.iterator(); it.hasNext();) {
Npc npc = it.next();
if (!npc.isActive() || npc.isTeleporting() || npc.getPosition().getLongestDelta(playerPosition) > player.getViewingDistance()) {
if (!npc.isActive() || npc.isTeleporting() || npc.getPosition().getLongestDelta(playerPosition) > player.getViewingDistance() || !npc.getPosition().isWithinDistance(playerPosition, player.getViewingDistance())) {
it.remove();
segments.add(new RemoveMobSegment());
} else {
@@ -68,7 +68,7 @@ public final class NpcSynchronizationTask extends SynchronizationTask {
}
Position npcPosition = npc.getPosition();
if (npcPosition.isWithinDistance(playerPosition, player.getViewingDistance()) && !localNpcs.contains(npc) && npcPosition.getHeight() == playerPosition.getHeight()) {
if (npcPosition.isWithinDistance(playerPosition, player.getViewingDistance()) && !localNpcs.contains(npc)) {
localNpcs.add(npc);
added++;
npc.turnTo(npc.getFacingPosition());
src/org/apollo/game/sync/task/PlayerSynchronizationTask.java
+1 -1
View File
@@ -69,7 +69,7 @@ public final class PlayerSynchronizationTask extends SynchronizationTask {
for (Iterator<Player> it = localPlayers.iterator(); it.hasNext();) {
Player other = it.next();
if (!other.isActive() || other.isTeleporting() || other.getPosition().getLongestDelta(player.getPosition()) > player.getViewingDistance()) {
if (!other.isActive() || other.isTeleporting() || other.getPosition().getLongestDelta(player.getPosition()) > player.getViewingDistance() || !other.getPosition().isWithinDistance(player.getPosition(), player.getViewingDistance())) {
it.remove();
segments.add(new RemoveMobSegment());
} else {