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

Changed 'region snapshots' from a list to a map, allowing for the removal of previous update operations. (They were stacking before this commit, leading to problems for players just entering the region) It appears that object updating is now functional. :)

Browse Source
This commit is contained in:
Steve
2015-04-10 08:01:08 -04:00
parent 84373635a1
commit 48b6dc7122
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/game/model/area/Region.java
+5 -4
View File
@@ -75,7 +75,7 @@ public final class Region {
/** /**
* The Set containing RegionUpdateMessages which can be sent to add every non-Mob Entity in this Region. * The Set containing RegionUpdateMessages which can be sent to add every non-Mob Entity in this Region.
*/ */
private final List<List<RegionUpdateMessage>> snapshots = new ArrayList<>(Position.HEIGHT_LEVELS); private final List<Map<Entity, RegionUpdateMessage>> snapshots = new ArrayList<>(Position.HEIGHT_LEVELS);
/** /**
* The Set containing UpdateOperations. * The Set containing UpdateOperations.
@@ -102,7 +102,7 @@ public final class Region {
listeners.add(new UpdateRegionListener()); listeners.add(new UpdateRegionListener());
for (int height = 0; height < Position.HEIGHT_LEVELS; height++) { for (int height = 0; height < Position.HEIGHT_LEVELS; height++) {
snapshots.add(new ArrayList<>()); snapshots.add(new HashMap<>());
updates.add(new ArrayList<>(DEFAULT_SET_SIZE)); updates.add(new ArrayList<>(DEFAULT_SET_SIZE));
} }
} }
@@ -220,7 +220,7 @@ public final class Region {
* @return The Set of RegionUpdateMessages. * @return The Set of RegionUpdateMessages.
*/ */
public List<RegionUpdateMessage> getSnapshot(int height) { public List<RegionUpdateMessage> getSnapshot(int height) {
List<RegionUpdateMessage> copy = new ArrayList<>(snapshots.get(height)); List<RegionUpdateMessage> copy = new ArrayList<>(snapshots.get(height).values());
Collections.sort(copy); Collections.sort(copy);
return ImmutableList.copyOf(copy); return ImmutableList.copyOf(copy);
} }
@@ -313,9 +313,10 @@ public final class Region {
int height = entity.getPosition().getHeight(); int height = entity.getPosition().getHeight();
updates.get(height).add(message); updates.get(height).add(message);
snapshots.get(height).remove(entity);
if (entity.getEntityType() != EntityType.STATIC_OBJECT || type == EntityUpdateType.REMOVE) { if (entity.getEntityType() != EntityType.STATIC_OBJECT || type == EntityUpdateType.REMOVE) {
snapshots.get(height).add(message); snapshots.get(height).put(entity, message);
} }
} }