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

Rename 'p' to 'other' in PlayerSynchronizationTask.

Browse Source
This commit is contained in:
Major-
2015-02-25 16:36:41 +00:00
parent a089569606
commit 341ea1e422
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/game/sync/task/PlayerSynchronizationTask.java
+11 -11
View File
@@ -69,13 +69,13 @@ public final class PlayerSynchronizationTask extends SynchronizationTask {
List<SynchronizationSegment> segments = new ArrayList<>(); List<SynchronizationSegment> segments = new ArrayList<>();
for (Iterator<Player> it = localPlayers.iterator(); it.hasNext();) { for (Iterator<Player> it = localPlayers.iterator(); it.hasNext();) {
Player p = it.next(); Player other = it.next();
if (!p.isActive() || p.isTeleporting() if (!other.isActive() || other.isTeleporting()
|| p.getPosition().getLongestDelta(player.getPosition()) > player.getViewingDistance()) { || other.getPosition().getLongestDelta(player.getPosition()) > player.getViewingDistance()) {
it.remove(); it.remove();
segments.add(new RemoveMobSegment()); segments.add(new RemoveMobSegment());
} else { } 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<Player> repository = World.getWorld().getPlayerRepository(); MobRepository<Player> repository = World.getWorld().getPlayerRepository();
for (Iterator<Player> it = repository.iterator(); it.hasNext();) { for (Iterator<Player> it = repository.iterator(); it.hasNext();) {
Player p = it.next(); Player other = it.next();
if (localPlayers.size() >= 255) { if (localPlayers.size() >= 255) {
player.flagExcessivePlayers(); player.flagExcessivePlayers();
break; break;
@@ -91,19 +91,19 @@ public final class PlayerSynchronizationTask extends SynchronizationTask {
break; break;
} }
if (p != player && p.getPosition().isWithinDistance(player.getPosition(), player.getViewingDistance()) if (other != player && other.getPosition().isWithinDistance(player.getPosition(), player.getViewingDistance())
&& !localPlayers.contains(p)) { && !localPlayers.contains(other)) {
localPlayers.add(p); localPlayers.add(other);
added++; added++;
blockSet = p.getBlockSet(); blockSet = other.getBlockSet();
if (!blockSet.contains(AppearanceBlock.class)) { if (!blockSet.contains(AppearanceBlock.class)) {
// TODO check if client has cached appearance // TODO check if client has cached appearance
blockSet = blockSet.clone(); 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()));
} }
} }