From 341ea1e422758c0f51b3b1bb808e48c0e0716e83 Mon Sep 17 00:00:00 2001 From: Major- Date: Wed, 25 Feb 2015 16:36:41 +0000 Subject: [PATCH] Rename 'p' to 'other' in PlayerSynchronizationTask. --- .../sync/task/PlayerSynchronizationTask.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java index 17dae8b4..e3155924 100644 --- a/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java @@ -69,13 +69,13 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { List segments = new ArrayList<>(); for (Iterator it = localPlayers.iterator(); it.hasNext();) { - Player p = it.next(); - if (!p.isActive() || p.isTeleporting() - || p.getPosition().getLongestDelta(player.getPosition()) > player.getViewingDistance()) { + Player other = it.next(); + if (!other.isActive() || other.isTeleporting() + || other.getPosition().getLongestDelta(player.getPosition()) > player.getViewingDistance()) { it.remove(); segments.add(new RemoveMobSegment()); } else { - segments.add(new MovementSegment(p.getBlockSet(), p.getDirections())); + segments.add(new MovementSegment(other.getBlockSet(), other.getDirections())); } } @@ -83,7 +83,7 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { MobRepository repository = World.getWorld().getPlayerRepository(); for (Iterator it = repository.iterator(); it.hasNext();) { - Player p = it.next(); + Player other = it.next(); if (localPlayers.size() >= 255) { player.flagExcessivePlayers(); break; @@ -91,19 +91,19 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { break; } - if (p != player && p.getPosition().isWithinDistance(player.getPosition(), player.getViewingDistance()) - && !localPlayers.contains(p)) { - localPlayers.add(p); + if (other != player && other.getPosition().isWithinDistance(player.getPosition(), player.getViewingDistance()) + && !localPlayers.contains(other)) { + localPlayers.add(other); added++; - blockSet = p.getBlockSet(); + blockSet = other.getBlockSet(); if (!blockSet.contains(AppearanceBlock.class)) { // TODO check if client has cached appearance blockSet = blockSet.clone(); - blockSet.add(SynchronizationBlock.createAppearanceBlock(p)); + blockSet.add(SynchronizationBlock.createAppearanceBlock(other)); } - segments.add(new AddPlayerSegment(blockSet, p.getIndex(), p.getPosition())); + segments.add(new AddPlayerSegment(blockSet, other.getIndex(), other.getPosition())); } }