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

Merge pull request #159 from ryleykimmel/issue153

Browse Source 
Fix issue #153
This commit is contained in:
Major
2016-02-05 17:42:55 +00:00
parent 3da0e37add 0bac265a06
commit 02a40c39f8
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/org/apollo/game/sync/task/NpcSynchronizationTask.java
+19 -1
View File
@@ -3,9 +3,15 @@ package org.apollo.game.sync.task;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
import org.apollo.game.message.impl.NpcSynchronizationMessage;
import org.apollo.game.model.Position;
import org.apollo.game.model.area.Region;
import org.apollo.game.model.area.RegionCoordinates;
import org.apollo.game.model.area.RegionRepository;
import org.apollo.game.model.entity.EntityType;
import org.apollo.game.model.entity.Npc;
import org.apollo.game.model.entity.Player;
import org.apollo.game.sync.seg.AddNpcSegment;
@@ -70,7 +76,18 @@ public final class NpcSynchronizationTask extends SynchronizationTask {
int added = 0, count = locals.size();
for (Npc npc : player.getWorld().getNpcRepository()) {
RegionRepository repository = player.getWorld().getRegionRepository();
Region current = repository.fromPosition(playerPosition);
Set<RegionCoordinates> regions = current.getSurrounding();
regions.add(current.getCoordinates());
Stream<Npc> npcs = regions.stream().map(repository::get)
.flatMap(region -> region.getEntities(EntityType.NPC));
Iterator<Npc> iterator = npcs.iterator();
while (iterator.hasNext()) {
if (count >= MAXIMUM_LOCAL_NPCS) {
player.flagExcessiveNpcs();
break;
@@ -78,6 +95,7 @@ public final class NpcSynchronizationTask extends SynchronizationTask {
break;
}
Npc npc = iterator.next();
Position position = npc.getPosition();
if (position.isWithinDistance(playerPosition, distance) && !locals.contains(npc)) {
locals.add(npc);
game/src/main/org/apollo/game/sync/task/PlayerSynchronizationTask.java
+19 -1
View File
@@ -3,9 +3,15 @@ package org.apollo.game.sync.task;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
import org.apollo.game.message.impl.PlayerSynchronizationMessage;
import org.apollo.game.model.Position;
import org.apollo.game.model.area.Region;
import org.apollo.game.model.area.RegionCoordinates;
import org.apollo.game.model.area.RegionRepository;
import org.apollo.game.model.entity.EntityType;
import org.apollo.game.model.entity.Player;
import org.apollo.game.sync.block.AppearanceBlock;
import org.apollo.game.sync.block.ChatBlock;
@@ -86,7 +92,18 @@ public final class PlayerSynchronizationTask extends SynchronizationTask {
int added = 0, count = localPlayers.size();
for (Player other : player.getWorld().getPlayerRepository()) {
RegionRepository repository = player.getWorld().getRegionRepository();
Region current = repository.fromPosition(position);
Set<RegionCoordinates> regions = current.getSurrounding();
regions.add(current.getCoordinates());
Stream<Player> players = regions.stream().map(repository::get)
.flatMap(region -> region.getEntities(EntityType.PLAYER));
Iterator<Player> iterator = players.iterator();
while (iterator.hasNext()) {
if (count >= MAXIMUM_LOCAL_PLAYERS) {
player.flagExcessivePlayers();
break;
@@ -94,6 +111,7 @@ public final class PlayerSynchronizationTask extends SynchronizationTask {
break;
}
Player other = iterator.next();
Position local = other.getPosition();
if (other != player && local.isWithinDistance(position, distance) && !localPlayers.contains(other)) {