Sync with L2JServer Jan 28th 2015.

2015-01-29 05:18:04 +00:00
parent 59e1db4a68
commit 2cb3a52ed2
224 changed files with 4690 additions and 835 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java
+++ b/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java
@@ -25,6 +25,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
@@ -371,6 +372,12 @@ public final class Instance
 		_manualSpawn.clear();
 	}
 	
+	public void removeSpawnedNpcs()
+	{
+		_npcs.stream().filter(Objects::nonNull).forEach(L2Npc::deleteMe);
+		_npcs.clear();
+	}
+	
 	public void removeDoors()
 	{
 		for (L2DoorInstance door : _doors.values())