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

Merge pull request #180 from ryleykimmel/issue142

Browse Source 
Queue npcs before unregistering
This commit is contained in:
Major
2016-02-09 21:13:18 +00:00
parent b99b20fbb4 56ff74e844
commit 4526797095
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/org/apollo/game/GameConstants.java
+1 -1
View File
@@ -10,7 +10,7 @@ public final class GameConstants {
/** /**
* The maximum amount of messages to process per pulse (per session). * The maximum amount of messages to process per pulse (per session).
*/ */
public static final int MESSAGES_PER_PULSE = 10; public static final int MESSAGES_PER_PULSE = 25;
/** /**
* The delay between consecutive pulses, in milliseconds. * The delay between consecutive pulses, in milliseconds.
game/src/main/org/apollo/game/model/World.java
+24 -6
View File
@@ -1,10 +1,10 @@
package org.apollo.game.model; package org.apollo.game.model;
import java.util.ArrayDeque;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.apollo.Service; import org.apollo.Service;
@@ -99,7 +99,12 @@ public final class World {
/** /**
* The Queue of Npcs that have yet to be added to the repository. * The Queue of Npcs that have yet to be added to the repository.
*/ */
private final Queue<Npc> queuedNpcs = new ConcurrentLinkedQueue<>(); private final Queue<Npc> queuedNpcs = new ArrayDeque<>();
/**
* The Queue of Npcs that have yet to be removed from the repository.
*/
private final Queue<Npc> oldNpcs = new ArrayDeque<>();
/** /**
* This world's {@link RegionRepository}. * This world's {@link RegionRepository}.
@@ -242,6 +247,7 @@ public final class World {
* Pulses this World. * Pulses this World.
*/ */
public void pulse() { public void pulse() {
unregisterNpcs();
registerNpcs(); registerNpcs();
scheduler.pulse(); scheduler.pulse();
} }
@@ -311,10 +317,7 @@ public final class World {
public void unregister(final Npc npc) { public void unregister(final Npc npc) {
Preconditions.checkNotNull(npc, "Npc may not be null."); Preconditions.checkNotNull(npc, "Npc may not be null.");
Region region = regions.fromPosition(npc.getPosition()); oldNpcs.add(npc);
region.removeEntity(npc);
npcRepository.remove(npc);
} }
/** /**
@@ -363,4 +366,19 @@ public final class World {
} }
} }
} }
/**
* Unregisters all of the {@link Npc}s in the {@link #oldNpcs queue}.
*/
private void unregisterNpcs() {
while (!oldNpcs.isEmpty()) {
Npc npc = oldNpcs.poll();
Region region = regions.fromPosition(npc.getPosition());
region.removeEntity(npc);
npcRepository.remove(npc);
}
}
} }