BETA: Enforcing IIdentifiable interface.

	* Continuing with [6149].

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -1259,7 +1259,7 @@ public class L2CharacterAI extends AbstractAI
 					break;
 			}
 			// water movement analysis
-			if (_actor instanceof L2Npc)
+			if (_actor.isNpc())
 			{
 				switch (_actor.getId())
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -60,6 +60,7 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.Fort;
 import com.l2jserver.gameserver.model.entity.Siegable;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -596,7 +597,7 @@ public final class TerritoryWarManager implements Siegable
 					{
 						for (TerritoryNPCSpawn wardSpawn : _territoryList.get(twWard.getOwnerCastleId()).getOwnedWard())
 						{
-							if (wardSpawn.getNpcId() == twWard.getTerritoryId())
+							if (wardSpawn.getId() == twWard.getTerritoryId())
 							{
 								wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
 								twWard.unSpawnMe();
@@ -1037,7 +1038,7 @@ public final class TerritoryWarManager implements Siegable
 					{
 						ward.setNPC(ward.getNpc().getSpawn().doSpawn());
 					}
-					_territoryWards.add(new TerritoryWard(ward.getNpcId(), ward.getLocation().getX(), ward.getLocation().getY(), ward.getLocation().getZ(), 0, ward.getNpcId() + 13479, t.getCastleId(), ward.getNpc()));
+					_territoryWards.add(new TerritoryWard(ward.getId(), ward.getLocation().getX(), ward.getLocation().getY(), ward.getLocation().getZ(), 0, ward.getId() + 13479, t.getCastleId(), ward.getNpc()));
 				}
 			}
 			t.getQuestDone()[0] = 0; // killed npc
@@ -1514,7 +1515,7 @@ public final class TerritoryWarManager implements Siegable
 		}
 	}
 	
-	public static class TerritoryNPCSpawn
+	public static class TerritoryNPCSpawn implements IIdentifiable
 	{
 		private final Location _location;
 		protected int _npcId;
@@ -1536,7 +1537,12 @@ public final class TerritoryWarManager implements Siegable
 			return _castleId;
 		}
 		
-		public int getNpcId()
+		/**
+		 * Gets the NPC ID.
+		 * @return the NPC ID
+		 */
+		@Override
+		public int getId()
 		{
 			return _npcId;
 		}
@@ -1649,7 +1655,7 @@ public final class TerritoryWarManager implements Siegable
 				}
 				if (isSpawn)
 				{
-					twSpawn.setNPC(spawnNPC(twSpawn.getNpcId(), twSpawn.getLocation()));
+					twSpawn.setNPC(spawnNPC(twSpawn.getId(), twSpawn.getLocation()));
 				}
 				else
 				{
@@ -1667,7 +1673,7 @@ public final class TerritoryWarManager implements Siegable
 		{
 			for (TerritoryNPCSpawn wardSpawn : _territoryWardSpawnPlaces)
 			{
-				if (wardSpawn.getNpcId() == wardId)
+				if (wardSpawn.getId() == wardId)
 				{
 					wardSpawn.getNpc().deleteMe();
 					wardSpawn.setNPC(null);
@@ -1728,9 +1734,9 @@ public final class TerritoryWarManager implements Siegable
 			FastList<Integer> ret = new FastList<>();
 			for (TerritoryNPCSpawn wardSpawn : _territoryWardSpawnPlaces)
 			{
-				if (wardSpawn.getNpcId() > 0)
+				if (wardSpawn.getId() > 0)
 				{
-					ret.add(wardSpawn.getNpcId());
+					ret.add(wardSpawn.getId());
 				}
 			}
 			return ret;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

@@ -41,6 +41,7 @@ import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -230,7 +231,7 @@ public class AutoSpawnHandler
 		try
 		{
 			// Try to remove from the list of registered spawns if it exists.
-			_registeredSpawns.remove(spawnInst.getNpcId());
+			_registeredSpawns.remove(spawnInst.getId());
 			
 			// Cancel the currently associated running scheduled task.
 			ScheduledFuture<?> respawnTask = _runningSpawns.remove(spawnInst._objectId);
@@ -360,7 +361,7 @@ public class AutoSpawnHandler
 		{
 			for (AutoSpawnInstance spawnInst : _registeredSpawns.values())
 			{
-				if (spawnInst.getNpcId() == id)
+				if (spawnInst.getId() == id)
 				{
 					return spawnInst;
 				}
@@ -375,7 +376,7 @@ public class AutoSpawnHandler
 		
 		for (AutoSpawnInstance spawnInst : _registeredSpawns.values())
 		{
-			if (spawnInst.getNpcId() == npcId)
+			if (spawnInst.getId() == npcId)
 			{
 				spawnInstList.put(spawnInst.getObjectId(), spawnInst);
 			}
@@ -466,10 +467,10 @@ public class AutoSpawnHandler
 				final int heading = locationList[locationIndex].getHeading();
 				
 				// Fetch the template for this NPC ID and create a new spawn.
-				L2NpcTemplate npcTemp = NpcTable.getInstance().getTemplate(spawnInst.getNpcId());
+				L2NpcTemplate npcTemp = NpcTable.getInstance().getTemplate(spawnInst.getId());
 				if (npcTemp == null)
 				{
-					_log.warning("Couldnt find NPC id" + spawnInst.getNpcId() + " Try to update your DP");
+					_log.warning("Couldnt find NPC id" + spawnInst.getId() + " Try to update your DP");
 					return;
 				}
 				
@@ -584,7 +585,7 @@ public class AutoSpawnHandler
 	 * Stores information about a registered auto spawn.
 	 * @author Tempy
 	 */
-	public static class AutoSpawnInstance
+	public static class AutoSpawnInstance implements IIdentifiable
 	{
 		protected int _objectId;
 		
@@ -655,7 +656,12 @@ public class AutoSpawnHandler
 			return _desDelay;
 		}
 		
-		public int getNpcId()
+		/**
+		 * Gets the NPC ID.
+		 * @return the NPC ID
+		 */
+		@Override
+		public int getId()
 		{
 			return _npcId;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/FortSiegeSpawn.java

@@ -18,11 +18,13 @@
  */
 package com.l2jserver.gameserver.model;
 
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
 /**
  * Fort Siege Spawn.
  * @author xban1x
  */
-public final class FortSiegeSpawn extends Location
+public final class FortSiegeSpawn extends Location implements IIdentifiable
 {
 	private final int _npcId;
 	private final int _fortId;
@@ -41,12 +43,17 @@ public final class FortSiegeSpawn extends Location
 		return _fortId;
 	}
 	
-	public int getNpcId()
+	/**
+	 * Gets the NPC ID.
+	 * @return the NPC ID
+	 */
+	@Override
+	public int getId()
 	{
 		return _npcId;
 	}
 	
-	public int getId()
+	public int getMessageId()
 	{
 		return _id;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TowerSpawn.java

@@ -20,10 +20,12 @@ package com.l2jserver.gameserver.model;
 
 import java.util.List;
 
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
 /**
  * @author malyelfik
  */
-public class TowerSpawn
+public class TowerSpawn implements IIdentifiable
 {
 	private final int _npcId;
 	private final Location _location;
@@ -43,7 +45,12 @@ public class TowerSpawn
 		_zoneList = zoneList;
 	}
 	
-	public int getNpcId()
+	/**
+	 * Gets the NPC ID.
+	 * @return the NPC ID
+	 */
+	@Override
+	public int getId()
 	{
 		return _npcId;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Decoy.java

@@ -107,7 +107,8 @@ public abstract class L2Decoy extends L2Character
 		return null;
 	}
 	
-	public final int getNpcId()
+	@Override
+	public final int getId()
 	{
 		return getTemplate().getId();
 	}
@@ -184,6 +185,6 @@ public abstract class L2Decoy extends L2Character
 	@Override
 	public boolean isInCategory(CategoryType type)
 	{
-		return CategoryData.getInstance().isInCategory(type, getNpcId());
+		return CategoryData.getInstance().isInCategory(type, getId());
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java

@@ -77,12 +77,6 @@ public class L2DecoyInstance extends L2Decoy
 		setKnownList(new DecoyKnownList(this));
 	}
 	
-	@Override
-	public int getId()
-	{
-		return 0;
-	}
-	
 	static class DecoyLifetime implements Runnable
 	{
 		private final L2PcInstance _activeChar;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java

@@ -126,10 +126,10 @@ public class L2FortCommanderInstance extends L2DefenderInstance
 			FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getFortId());
 			for (FortSiegeSpawn spawn2 : commanders)
 			{
-				if (spawn2.getNpcId() == spawn.getId())
+				if (spawn2.getId() == spawn.getId())
 				{
 					NpcStringId npcString = null;
-					switch (spawn2.getId())
+					switch (spawn2.getMessageId())
 					{
 						case 1:
 							npcString = NpcStringId.ATTACKING_THE_ENEMYS_REINFORCEMENTS_IS_NECESSARY_TIME_TO_DIE;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2CharTemplate.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.stats.MoveType;
 
 /**
+ * Character template.
  * @author Zoey76
  */
 public class L2CharTemplate

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -616,7 +616,7 @@ public class Fort
 	public void upgradeDoor(int doorId, int hp, int pDef, int mDef)
 	{
 		L2DoorInstance door = getDoor(doorId);
-		if ((door != null) && (door.getId() == doorId))
+		if (door != null)
 		{
 			door.setCurrentHp(door.getMaxHp() + hp);
 			

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -641,10 +641,10 @@ public class FortSiege implements Siegable
 				FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getFortId());
 				for (FortSiegeSpawn spawn2 : commanders)
 				{
-					if (spawn2.getNpcId() == spawn.getId())
+					if (spawn2.getId() == spawn.getId())
 					{
 						NpcStringId npcString = null;
-						switch (spawn2.getId())
+						switch (spawn2.getMessageId())
 						{
 							case 1:
 								npcString = NpcStringId.YOU_MAY_HAVE_BROKEN_OUR_ARROWS_BUT_YOU_WILL_NEVER_BREAK_OUR_WILL_ARCHERS_RETREAT;
@@ -1162,7 +1162,7 @@ public class FortSiege implements Siegable
 			L2NpcTemplate template1;
 			for (FortSiegeSpawn _sp : FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getFortId()))
 			{
-				template1 = NpcTable.getInstance().getTemplate(_sp.getNpcId());
+				template1 = NpcTable.getInstance().getTemplate(_sp.getId());
 				if (template1 != null)
 				{
 					spawnDat = new L2Spawn(template1);
@@ -1178,7 +1178,7 @@ public class FortSiege implements Siegable
 				}
 				else
 				{
-					_log.warning("FortSiege.spawnCommander: Data missing in NPC table for ID: " + _sp.getNpcId() + ".");
+					_log.warning("FortSiege.spawnCommander: Data missing in NPC table for ID: " + _sp.getId() + ".");
 				}
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -1477,7 +1477,7 @@ public class Siege implements Siegable
 		{
 			try
 			{
-				final L2Spawn spawn = new L2Spawn(NpcTable.getInstance().getTemplate(ts.getNpcId()));
+				final L2Spawn spawn = new L2Spawn(NpcTable.getInstance().getTemplate(ts.getId()));
 				spawn.setLocation(ts.getLocation());
 				_controlTowers.add((L2ControlTowerInstance) spawn.doSpawn());
 			}
@@ -1498,7 +1498,7 @@ public class Siege implements Siegable
 		{
 			try
 			{
-				final L2Spawn spawn = new L2Spawn(NpcTable.getInstance().getTemplate(ts.getNpcId()));
+				final L2Spawn spawn = new L2Spawn(NpcTable.getInstance().getTemplate(ts.getId()));
 				spawn.setLocation(ts.getLocation());
 				final L2FlameTowerInstance tower = (L2FlameTowerInstance) spawn.doSpawn();
 				tower.setUpgradeLevel(ts.getUpgradeLevel());

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java

@@ -56,7 +56,7 @@ public class ExShowFortressMapInfo extends L2GameServerPacket
 				{
 					for (FortSiegeSpawn spawn : commanders)
 					{
-						if (isSpawned(spawn.getNpcId()))
+						if (isSpawned(spawn.getId()))
 						{
 							writeD(0);
 						}
@@ -77,7 +77,7 @@ public class ExShowFortressMapInfo extends L2GameServerPacket
 						{
 							writeD(1); // TODO: control room emulated
 						}
-						if (isSpawned(spawn.getNpcId()))
+						if (isSpawned(spawn.getId()))
 						{
 							writeD(0);
 						}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java

@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.util.Util;
 
 /**
- ** @author Gnacik
+ * @author Gnacik
  */
 public class OnEventTrigger extends L2GameServerPacket
 {