BETA: Datapack part for [L6149].

	* Removed lot of casting.

'''Note:''' If you get errors on your custom scripts after synchronizing, just check and change methods from getXXXId() to getId().

L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java

@@ -56,7 +56,7 @@ public class HandysBlockCheckerEvent extends Quest
 			return null;
 		}
 		
-		final int arena = npc.getNpcId() - A_MANAGER_1;
+		final int arena = npc.getId() - A_MANAGER_1;
 		if (eventIsFull(arena))
 		{
 			player.sendPacket(SystemMessageId.CANNOT_REGISTER_CAUSE_QUEUE_FULL);

L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java

@@ -329,7 +329,7 @@ public class MC_Show extends AbstractNpcAI
 	
 	private void autoChat(L2Npc npc, NpcStringId npcString, int type)
 	{
-		npc.broadcastPacket(new NpcSay(npc.getObjectId(), type, npc.getNpcId(), npcString));
+		npc.broadcastPacket(new NpcSay(npc.getObjectId(), type, npc.getId(), npcString));
 	}
 	
 	@Override
@@ -337,7 +337,7 @@ public class MC_Show extends AbstractNpcAI
 	{
 		if (IS_STARTED)
 		{
-			switch (npc.getNpcId())
+			switch (npc.getId())
 			{
 				case 32433:
 					autoChat(npc, MESSAGES[0], Say2.NPC_SHOUT);
@@ -405,7 +405,7 @@ public class MC_Show extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("7"))
 			{
-				switch (npc.getNpcId())
+				switch (npc.getId())
 				{
 					case 32433:
 						autoChat(npc, MESSAGES[7], Say2.NPC_SHOUT);
@@ -435,7 +435,7 @@ public class MC_Show extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("11"))
 			{
-				switch (npc.getNpcId())
+				switch (npc.getId())
 				{
 					case 32433:
 						autoChat(npc, MESSAGES[10], Say2.NPC_SHOUT);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java

@@ -311,7 +311,7 @@ public class BeastFarm extends AbstractNpcAI
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
 		// gather some values on local variables
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int skillId = skill.getId();
 		// check if the npc and skills used are valid for this script. Exit if invalid.
 		if (!Util.contains(FEEDABLE_BEASTS, npcId) || ((skillId != SKILL_GOLDEN_SPICE) && (skillId != SKILL_CRYSTAL_SPICE) && (skillId != SKILL_BLESSED_GOLDEN_SPICE) && (skillId != SKILL_BLESSED_CRYSTAL_SPICE) && (skillId != SKILL_SGRADE_GOLDEN_SPICE) && (skillId != SKILL_SGRADE_CRYSTAL_SPICE)))

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java

@@ -98,7 +98,7 @@ public class Chimeras extends AbstractNpcAI
 					}
 					
 					npc.setIsDead(true);
-					if (npc.getNpcId() == CELTUS)
+					if (npc.getId() == CELTUS)
 					{
 						((L2Attackable) npc).dropItem(caster, CONTAINED_LIFE_FORCE, 1);
 					}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DenOfEvil.java

@@ -121,7 +121,7 @@ public class DenOfEvil extends AbstractNpcAI
 			_log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ());
 			return null;
 		}
-		int skillId = getSkillIdByNpcId(npc.getNpcId());
+		int skillId = getSkillIdByNpcId(npc.getId());
 		int skillLevel = zone.getSkillLevel(skillId);
 		zone.addSkill(skillId, skillLevel + 1);
 		if (skillLevel == 3) // 3+1=4
@@ -146,7 +146,7 @@ public class DenOfEvil extends AbstractNpcAI
 			_log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ());
 			return null;
 		}
-		int skillId = getSkillIdByNpcId(npc.getNpcId());
+		int skillId = getSkillIdByNpcId(npc.getId());
 		int skillLevel = zone.getSkillLevel(skillId);
 		zone.addSkill(skillId, skillLevel - 1);
 		return super.onKill(npc, killer, isSummon);
@@ -220,7 +220,7 @@ public class DenOfEvil extends AbstractNpcAI
 						{
 							// respawn eye
 							L2Npc npc = (L2Npc) character;
-							if (Util.contains(EYE_IDS, npc.getNpcId()))
+							if (Util.contains(EYE_IDS, npc.getId()))
 							{
 								ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(npc.getLocation()), 15000);
 							}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DragonValley.java

@@ -103,11 +103,11 @@ public class DragonValley extends AbstractNpcAI
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
 		L2Attackable mob = (L2Attackable) npc;
-		if (Util.contains(HERB_DROP, npc.getNpcId()) && mob.isSweepActive())
+		if (Util.contains(HERB_DROP, npc.getId()) && mob.isSweepActive())
 		{
 			((L2Attackable) npc).dropItem(killer, getRandom(8604, 8605), 1);
 		}
-		else if (npc.getNpcId() == NECROMANCER_OF_THE_VALLEY)
+		else if (npc.getId() == NECROMANCER_OF_THE_VALLEY)
 		{
 			spawnGhost(npc, killer, isSummon, 20);
 		}
@@ -125,7 +125,7 @@ public class DragonValley extends AbstractNpcAI
 	public String onSpawn(L2Npc npc)
 	{
 		((L2Attackable) npc).setOnKillDelay(0);
-		if (npc.getNpcId() == EXPLODING_ORC_GHOST)
+		if (npc.getId() == EXPLODING_ORC_GHOST)
 		{
 			startQuestTimer("SelfDestruction", 3000, npc, null);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java

@@ -144,7 +144,7 @@ public class EnergySeeds extends AbstractNpcAI
 			{
 				int itemId = 0;
 				
-				switch (npc.getNpcId())
+				switch (npc.getId())
 				{
 					case 18678: // Water
 						itemId = 14016;
@@ -235,7 +235,7 @@ public class EnergySeeds extends AbstractNpcAI
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (npc.getNpcId() == TEMPORARY_TELEPORTER)
+		if (npc.getId() == TEMPORARY_TELEPORTER)
 		{
 			player.teleToLocation(SOD_EXIT_POINT[0], SOD_EXIT_POINT[1], SOD_EXIT_POINT[2]);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EvasGiftBoxes.java

@@ -58,7 +58,7 @@ public class EvasGiftBoxes extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		if (npc.getNpcId() == GIFTBOX)
+		if (npc.getId() == GIFTBOX)
 		{
 			int isKissOfEvaBuffed = 0;
 			if (killer.getFirstEffect(KISSOFEVA) != null)

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java

@@ -52,7 +52,7 @@ public class FairyTrees extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (Util.contains(MOBS, npcId))
 		{
 			for (int i = 0; i < 20; i++)

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java

@@ -348,7 +348,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	
 	private void spawnNext(L2Npc npc, int growthLevel, L2PcInstance player, int food)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int nextNpcId = 0;
 		
 		// find the next mob to spawn, based on the current npcId, growthlevel, and food.
@@ -476,7 +476,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null))
 		{
-			if (MAD_COW_POLYMORPH.containsKey(npc.getNpcId()))
+			if (MAD_COW_POLYMORPH.containsKey(npc.getId()))
 			{
 				// remove the feed info from the previous mob
 				if (_FeedInfo.get(npc.getObjectId()) == player.getObjectId())
@@ -486,7 +486,7 @@ public class FeedableBeasts extends AbstractNpcAI
 				// despawn the mad cow
 				npc.deleteMe();
 				// spawn the new mob
-				L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getNpcId()), npc);
+				L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc);
 				
 				// register the player in the feedinfo for the mob that just spawned
 				_FeedInfo.put(nextNpc.getObjectId(), player.getObjectId());
@@ -508,7 +508,7 @@ public class FeedableBeasts extends AbstractNpcAI
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
 		// gather some values on local variables
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int skillId = skill.getId();
 		// check if the npc and skills used are valid for this script. Exit if invalid.
 		if ((skillId != SKILL_GOLDEN_SPICE) && (skillId != SKILL_CRYSTAL_SPICE))

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java

@@ -48,7 +48,7 @@ public final class FrozenLabyrinth extends AbstractNpcAI
 	{
 		if (npc.isScriptValue(0) && (skill != null) && !skill.isMagic())
 		{
-			final int spawnId = (npc.getNpcId() == PRONGHORN) ? PRONGHORN_SPIRIT : LOST_BUFFALO;
+			final int spawnId = (npc.getId() == PRONGHORN) ? PRONGHORN_SPIRIT : LOST_BUFFALO;
 			int diff = 0;
 			for (int i = 0; i < 6; i++)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java

@@ -61,7 +61,7 @@ public final class IsleOfPrayer extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case ISLAND_GUARDIAN:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java

@@ -180,7 +180,7 @@ public final class L2AttackableAIScript extends Quest
 			final L2MonsterInstance mob = (L2MonsterInstance) npc;
 			if ((mob.getLeader() != null) && mob.getLeader().hasMinions())
 			{
-				final int respawnTime = Config.MINIONS_RESPAWN_TIME.containsKey(npc.getNpcId()) ? Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) * 1000 : -1;
+				final int respawnTime = Config.MINIONS_RESPAWN_TIME.containsKey(npc.getId()) ? Config.MINIONS_RESPAWN_TIME.get(mob.getId()) * 1000 : -1;
 				mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
 			}
 			
@@ -205,12 +205,12 @@ public final class L2AttackableAIScript extends Quest
 				{
 					if (L2Attackable.class.isAssignableFrom(Class.forName("com.l2jserver.gameserver.model.actor.instance." + t.getType() + "Instance")))
 					{
-						ai.addEventId(Quest.QuestEventType.ON_ATTACK, t.getNpcId());
-						ai.addEventId(Quest.QuestEventType.ON_KILL, t.getNpcId());
-						ai.addEventId(Quest.QuestEventType.ON_SPAWN, t.getNpcId());
-						ai.addEventId(Quest.QuestEventType.ON_SKILL_SEE, t.getNpcId());
-						ai.addEventId(Quest.QuestEventType.ON_FACTION_CALL, t.getNpcId());
-						ai.addEventId(Quest.QuestEventType.ON_AGGRO_RANGE_ENTER, t.getNpcId());
+						ai.addEventId(Quest.QuestEventType.ON_ATTACK, t.getId());
+						ai.addEventId(Quest.QuestEventType.ON_KILL, t.getId());
+						ai.addEventId(Quest.QuestEventType.ON_SPAWN, t.getId());
+						ai.addEventId(Quest.QuestEventType.ON_SKILL_SEE, t.getId());
+						ai.addEventId(Quest.QuestEventType.ON_FACTION_CALL, t.getId());
+						ai.addEventId(Quest.QuestEventType.ON_AGGRO_RANGE_ENTER, t.getId());
 					}
 				}
 				catch (ClassNotFoundException ex)

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/MithrilMines.java

@@ -64,7 +64,7 @@ public final class MithrilMines extends AbstractNpcAI
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		final int[] minions = (npc.getNpcId() == GRAVE_ROBBER_SUMMONER) ? SUMMONER_MINIONS : MAGICIAN_MINIONS;
+		final int[] minions = (npc.getId() == GRAVE_ROBBER_SUMMONER) ? SUMMONER_MINIONS : MAGICIAN_MINIONS;
 		addMinion((L2MonsterInstance) npc, minions[getRandom(minions.length)]);
 		return super.onSpawn(npc);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java

@@ -104,7 +104,7 @@ public class Monastery extends AbstractNpcAI
 		{
 			for (L2Character character : npc.getKnownList().getKnownCharactersInRadius(300))
 			{
-				if (character.isNpc() && (((L2Npc) character).getNpcId() == SCARECROW))
+				if (character.isNpc() && (character.getId() == SCARECROW))
 				{
 					for (L2Skill skill : npc.getAllSkills())
 					{
@@ -151,7 +151,7 @@ public class Monastery extends AbstractNpcAI
 			final double distance = Math.sqrt(npc.getPlanDistanceSq(player.getX(), player.getY()));
 			if (((distance < 500) && !player.isDead() && GeoData.getInstance().canSeeTarget(npc, player)))
 			{
-				switch (npc.getNpcId())
+				switch (npc.getId())
 				{
 					case CAPTAIN:
 					case KNIGHT:
@@ -213,7 +213,7 @@ public class Monastery extends AbstractNpcAI
 			{
 				if (obj.equals(npc))
 				{
-					NpcSay packet = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), DIVINITY_MSG[getRandom(1)]);
+					NpcSay packet = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), DIVINITY_MSG[getRandom(1)]);
 					packet.addStringParameter(caster.getName());
 					npc.broadcastPacket(packet);
 					((L2Attackable) npc).addDamageHate(caster, 0, 999);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PavelArchaic.java

@@ -59,7 +59,7 @@ public class PavelArchaic extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		L2Attackable golem = (L2Attackable) addSpawn(npc.getNpcId() + 1, npc.getLocation(), false, 0);
+		L2Attackable golem = (L2Attackable) addSpawn(npc.getId() + 1, npc.getLocation(), false, 0);
 		attackPlayer(golem, killer);
 		return super.onKill(npc, killer, isSummon);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfDion.java

@@ -81,7 +81,7 @@ public final class PlainsOfDion extends AbstractNpcAI
 			
 			for (L2Character obj : npc.getKnownList().getKnownCharactersInRadius(npc.getFactionRange()))
 			{
-				if (obj.isMonster() && Util.contains(DELU_LIZARDMEN, ((L2MonsterInstance) obj).getNpcId()) && !obj.isAttackingNow() && !obj.isDead() && GeoData.getInstance().canSeeTarget(npc, obj))
+				if (obj.isMonster() && Util.contains(DELU_LIZARDMEN, obj.getId()) && !obj.isAttackingNow() && !obj.isDead() && GeoData.getInstance().canSeeTarget(npc, obj))
 				{
 					final L2MonsterInstance monster = (L2MonsterInstance) obj;
 					attackPlayer(monster, player);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java

@@ -118,7 +118,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case TANTA_SUMMONER:
 				if (npc.getFirstEffect(DEMOTIVATION_HEX.getSkillId()) == null)
@@ -145,7 +145,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI
 						if ((target != null) && target.isL2Attackable())
 						{
 							final L2Attackable monster = (L2Attackable) target;
-							if ((monster.getNpcId() == TANTA_MAGICIAN) || (monster.getNpcId() == TANTA_SCOUT))
+							if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT))
 							{
 								target.setIsRunning(true);
 								target.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX(), npc.getY(), npc.getZ(), 0));

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java

@@ -51,7 +51,7 @@ public class PolymorphingAngel extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		L2Attackable newNpc = (L2Attackable) addSpawn(ANGELSPAWNS.get(npc.getNpcId()), npc);
+		L2Attackable newNpc = (L2Attackable) addSpawn(ANGELSPAWNS.get(npc.getId()), npc);
 		newNpc.setRunning();
 		return super.onKill(npc, killer, isSummon);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java

@@ -90,7 +90,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI
 	{
 		if (npc.isVisible() && !npc.isDead())
 		{
-			final List<Integer> tmp = MOBSPAWNS.get(npc.getNpcId());
+			final List<Integer> tmp = MOBSPAWNS.get(npc.getId());
 			if (tmp != null)
 			{
 				if ((npc.getCurrentHp() <= ((npc.getMaxHp() * tmp.get(1)) / 100.0)) && (getRandom(100) < tmp.get(2)))

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java

@@ -90,7 +90,7 @@ public class PrisonGuards extends AbstractNpcAI
 		{
 			npc.setIsNoRndWalk(true);
 			npc.setIsImmobilized(true);
-			if (npc.getNpcId() == GUARD1)
+			if (npc.getId() == GUARD1)
 			{
 				npc.setIsInvul(true);
 				npc.disableCoreAI(true);
@@ -103,10 +103,10 @@ public class PrisonGuards extends AbstractNpcAI
 	{
 		if (event.equals("Respawn"))
 		{
-			L2Npc newGuard = addSpawn(npc.getNpcId(), npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0);
+			L2Npc newGuard = addSpawn(npc.getId(), npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0);
 			newGuard.setIsNoRndWalk(true);
 			newGuard.setIsImmobilized(true);
-			if (npc.getNpcId() == GUARD1)
+			if (npc.getId() == GUARD1)
 			{
 				newGuard.setIsInvul(true);
 				newGuard.disableCoreAI(true);
@@ -116,7 +116,7 @@ public class PrisonGuards extends AbstractNpcAI
 			_guards.remove(npc);
 			_guards.put(newGuard, place);
 		}
-		else if (event.equals("attackEnd") && (npc.getNpcId() == GUARD2))
+		else if (event.equals("attackEnd") && (npc.getId() == GUARD2))
 		{
 			if ((npc.getX() != npc.getSpawn().getX()) || (npc.getY() != npc.getSpawn().getY()))
 			{
@@ -135,7 +135,7 @@ public class PrisonGuards extends AbstractNpcAI
 	{
 		L2Character caster = isSummon ? player.getSummon() : player;
 		
-		if (npc.getNpcId() == GUARD2)
+		if (npc.getId() == GUARD2)
 		{
 			if (_firstAttacked && (caster.getFirstEffect(SKILL_EVENT_TIMER) == null))
 			{
@@ -154,7 +154,7 @@ public class PrisonGuards extends AbstractNpcAI
 	{
 		L2Character target = isSummon ? player.getSummon() : player;
 		
-		if (npc.getNpcId() == GUARD2)
+		if (npc.getId() == GUARD2)
 		{
 			if (target.getFirstEffect(SKILL_EVENT_TIMER) != null)
 			{
@@ -205,7 +205,7 @@ public class PrisonGuards extends AbstractNpcAI
 			return null;
 		}
 		
-		if (npc.getNpcId() == GUARD2)
+		if (npc.getId() == GUARD2)
 		{
 			cancelQuestTimer("attackEnd", null, null);
 			startQuestTimer("attackEnd", 180000, npc, null);
@@ -216,7 +216,7 @@ public class PrisonGuards extends AbstractNpcAI
 			((L2Attackable) npc).addDamageHate(attacker, 0, 999);
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker);
 		}
-		else if ((npc.getNpcId() == GUARD1) && (getRandom(100) < 5))
+		else if ((npc.getId() == GUARD1) && (getRandom(100) < 5))
 		{
 			final QuestState qs = player.getQuestState(IOPRace.class.getSimpleName());
 			if ((qs != null) && (qs.getInt(GUARDVARS[_guards.get(npc)]) != 1))
@@ -244,8 +244,8 @@ public class PrisonGuards extends AbstractNpcAI
 	{
 		if (fromAttack)
 		{
-			NpcStringId npcString = (npc.getNpcId() == GUARD1 ? NpcStringId.ITS_NOT_EASY_TO_OBTAIN : NpcStringId.YOURE_OUT_OF_YOUR_MIND_COMING_HERE);
-			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), npcString));
+			NpcStringId npcString = (npc.getId() == GUARD1 ? NpcStringId.ITS_NOT_EASY_TO_OBTAIN : NpcStringId.YOURE_OUT_OF_YOUR_MIND_COMING_HERE);
+			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), npcString));
 		}
 		
 		L2Skill skill = SkillTable.getInstance().getInfo(effectId, isSpell ? 9 : 1);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/RandomSpawn.java

@@ -93,7 +93,7 @@ public class RandomSpawn extends AbstractNpcAI
 	{
 		if (!npc.isTeleporting())
 		{
-			final Location[] spawnlist = SPAWN_POINTS.get(npc.getNpcId());
+			final Location[] spawnlist = SPAWN_POINTS.get(npc.getId());
 			final Location loc = spawnlist[getRandom(spawnlist.length)];
 			if (!npc.isInsideRadius(loc, 200, false, false))
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeedOfAnnihilation.java

@@ -310,7 +310,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	{
 		for (SeedRegion element : _regionsData)
 		{
-			if (Util.contains(element.elite_mob_ids, npc.getNpcId()))
+			if (Util.contains(element.elite_mob_ids, npc.getId()))
 			{
 				spawnGroupOfMinion((L2MonsterInstance) npc, element.minion_lists[getRandom(element.minion_lists.length)]);
 			}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Slaves.java

@@ -81,7 +81,7 @@ public class Slaves extends AbstractNpcAI
 					slave.clearAggroList();
 					slave.abortAttack();
 					slave.abortCast();
-					slave.broadcastPacket(new NpcSay(slave.getObjectId(), Say2.NPC_ALL, slave.getNpcId(), NpcStringId.THANK_YOU_FOR_SAVING_ME_FROM_THE_CLUTCHES_OF_EVIL));
+					slave.broadcastPacket(new NpcSay(slave.getObjectId(), Say2.NPC_ALL, slave.getId(), NpcStringId.THANK_YOU_FOR_SAVING_ME_FROM_THE_CLUTCHES_OF_EVIL));
 					
 					if ((HellboundManager.getInstance().getLevel() >= 1) && (HellboundManager.getInstance().getLevel() <= 2))
 					{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StakatoNest.java

@@ -95,7 +95,7 @@ public class StakatoNest extends AbstractNpcAI
 	{
 		L2MonsterInstance mob = (L2MonsterInstance) npc;
 		
-		if ((mob.getNpcId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
+		if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
 		{
 			L2MonsterInstance _follower = checkMinion(npc);
 			
@@ -122,7 +122,7 @@ public class StakatoNest extends AbstractNpcAI
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
 		L2MonsterInstance monster;
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case STAKATO_NURSE:
 				monster = checkMinion(npc);
@@ -183,7 +183,7 @@ public class StakatoNest extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if (Util.contains(COCOONS, npc.getNpcId()) && Util.contains(targets, npc) && (skill.getId() == GROWTH_ACCELERATOR))
+		if (Util.contains(COCOONS, npc.getId()) && Util.contains(targets, npc) && (skill.getId() == GROWTH_ACCELERATOR))
 		{
 			npc.doDie(caster);
 			L2Npc spawned = addSpawn(STAKATO_CHIEF, npc.getX(), npc.getY(), npc.getZ(), Util.calculateHeadingFrom(npc, caster), false, 0, true);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java

@@ -54,7 +54,7 @@ public class StarStones extends AbstractNpcAI
 		{
 			int itemId = 0;
 			
-			switch (npc.getNpcId())
+			switch (npc.getId())
 			{
 				case 18684:
 				case 18685:

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java

@@ -109,7 +109,7 @@ public class SummonMinions extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int npcObjId = npc.getObjectId();
 		
 		if (!myTrackingSet.contains(npcObjId)) // this allows to handle multiple instances of npc

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/VarkaKetra.java

@@ -152,12 +152,12 @@ public class VarkaKetra extends AbstractNpcAI
 	{
 		if (Util.checkIfInRange(1500, player, npc, false))
 		{
-			if (Util.contains(KETRA, npc.getNpcId()) && hasAtLeastOneQuestItem(player, KETRA_MARKS))
+			if (Util.contains(KETRA, npc.getId()) && hasAtLeastOneQuestItem(player, KETRA_MARKS))
 			{
 				decreaseAlliance(player, KETRA_MARKS);
 				exitQuests(player, KETRA_QUESTS);
 			}
-			else if (Util.contains(VARKA, npc.getNpcId()) && hasAtLeastOneQuestItem(player, VARKA_MARKS))
+			else if (Util.contains(VARKA, npc.getId()) && hasAtLeastOneQuestItem(player, VARKA_MARKS))
 			{
 				decreaseAlliance(player, VARKA_MARKS);
 				exitQuests(player, VARKA_QUESTS);
@@ -196,7 +196,7 @@ public class VarkaKetra extends AbstractNpcAI
 	@Override
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		if ((Util.contains(KETRA, npc.getNpcId()) && hasAtLeastOneQuestItem(player, KETRA_MARKS)) || (Util.contains(VARKA, npc.getNpcId()) && hasAtLeastOneQuestItem(player, VARKA_MARKS)))
+		if ((Util.contains(KETRA, npc.getId()) && hasAtLeastOneQuestItem(player, KETRA_MARKS)) || (Util.contains(VARKA, npc.getId()) && hasAtLeastOneQuestItem(player, VARKA_MARKS)))
 		{
 			if (((L2Attackable) npc).containsTarget(player))
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Amaskari.java

@@ -80,7 +80,7 @@ public class Amaskari extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("stop_toggle"))
 		{
-			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), AMASKARI_NPCSTRING_ID[2]));
+			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), AMASKARI_NPCSTRING_ID[2]));
 			((L2MonsterInstance) npc).clearAggroList();
 			((L2MonsterInstance) npc).getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
 			npc.setIsInvul(false);
@@ -90,11 +90,11 @@ public class Amaskari extends AbstractNpcAI
 		{
 			if (getRandom(100) > 20)
 			{
-				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), MINIONS_NPCSTRING_ID[2]));
+				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), MINIONS_NPCSTRING_ID[2]));
 			}
 			else if (getRandom(100) > 40)
 			{
-				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), MINIONS_NPCSTRING_ID[3]));
+				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), MINIONS_NPCSTRING_ID[3]));
 			}
 			startQuestTimer("onspawn_msg", (getRandom(8) + 1) * 30000, npc, null);
 		}
@@ -104,14 +104,14 @@ public class Amaskari extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
 	{
-		if ((npc.getNpcId() == AMASKARI) && (getRandom(1000) < 25))
+		if ((npc.getId() == AMASKARI) && (getRandom(1000) < 25))
 		{
-			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), AMASKARI_NPCSTRING_ID[0]));
+			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), AMASKARI_NPCSTRING_ID[0]));
 			for (L2MonsterInstance minion : ((L2MonsterInstance) npc).getMinionList().getSpawnedMinions())
 			{
 				if ((minion != null) && !minion.isDead() && (getRandom(10) == 0))
 				{
-					minion.broadcastPacket(new NpcSay(minion.getObjectId(), Say2.NPC_ALL, minion.getNpcId(), MINIONS_NPCSTRING_ID[0]));
+					minion.broadcastPacket(new NpcSay(minion.getObjectId(), Say2.NPC_ALL, minion.getId(), MINIONS_NPCSTRING_ID[0]));
 					minion.setCurrentHp(minion.getCurrentHp() - (minion.getCurrentHp() / 5));
 				}
 			}
@@ -122,12 +122,12 @@ public class Amaskari extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		if (npc.getNpcId() == AMASKARI_PRISONER)
+		if (npc.getId() == AMASKARI_PRISONER)
 		{
 			final L2MonsterInstance master = ((L2MonsterInstance) npc).getLeader();
 			if ((master != null) && !master.isDead())
 			{
-				master.broadcastPacket(new NpcSay(master.getObjectId(), Say2.NPC_ALL, master.getNpcId(), AMASKARI_NPCSTRING_ID[1]));
+				master.broadcastPacket(new NpcSay(master.getObjectId(), Say2.NPC_ALL, master.getId(), AMASKARI_NPCSTRING_ID[1]));
 				final L2Effect e = master.getFirstEffect(BUFF_ID);
 				if ((e != null) && (e.getSkill().getAbnormalLvl() == 3) && master.isInvul())
 				{
@@ -147,7 +147,7 @@ public class Amaskari extends AbstractNpcAI
 					}
 					else
 					{
-						master.broadcastPacket(new NpcSay(master.getObjectId(), Say2.NPC_ALL, master.getNpcId(), AMASKARI_NPCSTRING_ID[3]));
+						master.broadcastPacket(new NpcSay(master.getObjectId(), Say2.NPC_ALL, master.getId(), AMASKARI_NPCSTRING_ID[3]));
 						// master.doCast(INVINCIBILITY.getSkill())
 						master.setIsInvul(true);
 						startQuestTimer("stop_toggle", 10000, master, null);
@@ -155,7 +155,7 @@ public class Amaskari extends AbstractNpcAI
 				}
 			}
 		}
-		else if (npc.getNpcId() == AMASKARI)
+		else if (npc.getId() == AMASKARI)
 		{
 			for (L2MonsterInstance minion : ((L2MonsterInstance) npc).getMinionList().getSpawnedMinions())
 			{
@@ -163,7 +163,7 @@ public class Amaskari extends AbstractNpcAI
 				{
 					if (getRandom(1000) > 300)
 					{
-						minion.broadcastPacket(new NpcSay(minion.getObjectId(), Say2.NPC_ALL, minion.getNpcId(), MINIONS_NPCSTRING_ID[1]));
+						minion.broadcastPacket(new NpcSay(minion.getObjectId(), Say2.NPC_ALL, minion.getId(), MINIONS_NPCSTRING_ID[1]));
 					}
 					
 					HellboundManager.getInstance().updateTrust(30, true);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java

@@ -619,7 +619,7 @@ public class Antharas extends AbstractNpcAI
 	@Override
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case 29070:
 			case 29071:
@@ -651,7 +651,7 @@ public class Antharas extends AbstractNpcAI
 		public void run()
 		{
 			L2Skill skill = null;
-			switch (_bomber.getNpcId())
+			switch (_bomber.getId())
 			{
 				case 29070:
 				case 29071:
@@ -684,7 +684,7 @@ public class Antharas extends AbstractNpcAI
 		}
 		else if ((skill != null) && ((skill.getId() == 5097) || (skill.getId() == 5094)))
 		{
-			switch (npc.getNpcId())
+			switch (npc.getId())
 			{
 				case 29070:
 				case 29071:
@@ -709,7 +709,7 @@ public class Antharas extends AbstractNpcAI
 			Long temp = (System.currentTimeMillis() - _LastAction);
 			if (temp > FWA_INACTIVITYTIME)
 			{
-				GrandBossManager.getInstance().setBossStatus(_antharas.getNpcId(), DORMANT);
+				GrandBossManager.getInstance().setBossStatus(_antharas.getId(), DORMANT);
 				setUnspawn();
 			}
 		}
@@ -875,22 +875,22 @@ public class Antharas extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		if ((npc.getNpcId() == 29019) || (npc.getNpcId() == 29066) || (npc.getNpcId() == 29067) || (npc.getNpcId() == 29068))
+		if ((npc.getId() == 29019) || (npc.getId() == 29066) || (npc.getId() == 29067) || (npc.getId() == 29068))
 		{
 			_LastAction = System.currentTimeMillis();
-			if (GrandBossManager.getInstance().getBossStatus(_antharas.getNpcId()) != FIGHTING)
+			if (GrandBossManager.getInstance().getBossStatus(_antharas.getId()) != FIGHTING)
 			{
 				_Zone.oustAllPlayers();
 			}
 			else if (!FWA_OLDANTHARAS && (_mobsSpawnTask == null))
 			{
-				startMinionSpawns(npc.getNpcId());
+				startMinionSpawns(npc.getId());
 			}
 		}
-		else if ((npc.getNpcId() > 29069) && (npc.getNpcId() < 29077) && (npc.getCurrentHp() <= damage))
+		else if ((npc.getId() > 29069) && (npc.getId() < 29077) && (npc.getCurrentHp() <= damage))
 		{
 			L2Skill skill = null;
-			switch (npc.getNpcId())
+			switch (npc.getId())
 			{
 				case 29070:
 				case 29071:
@@ -913,23 +913,23 @@ public class Antharas extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		if ((npc.getNpcId() == 29019) || (npc.getNpcId() == 29066) || (npc.getNpcId() == 29067) || (npc.getNpcId() == 29068))
+		if ((npc.getId() == 29019) || (npc.getId() == 29066) || (npc.getId() == 29067) || (npc.getId() == 29068))
 		{
 			broadcastPacket(new SpecialCamera(_antharas.getObjectId(), 1200, 20, -10, 0, 13000, 0, 0, 1, 0));
 			npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 			_cubeSpawnTask = ThreadPoolManager.getInstance().scheduleGeneral(new CubeSpawn(0), 10000);
-			GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
+			GrandBossManager.getInstance().setBossStatus(npc.getId(), DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ANTHARAS_SPAWN_INTERVAL + getRandom(-Config.ANTHARAS_SPAWN_RANDOM, Config.ANTHARAS_SPAWN_RANDOM);
 			respawnTime *= 3600000;
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new UnlockAntharas(npc.getNpcId()), respawnTime);
+			ThreadPoolManager.getInstance().scheduleGeneral(new UnlockAntharas(npc.getId()), respawnTime);
 			// also save the respawn time so that the info is maintained past reboots
-			StatsSet info = GrandBossManager.getInstance().getStatsSet(npc.getNpcId());
+			StatsSet info = GrandBossManager.getInstance().getStatsSet(npc.getId());
 			info.set("respawn_time", (System.currentTimeMillis() + respawnTime));
-			GrandBossManager.getInstance().setStatsSet(npc.getNpcId(), info);
+			GrandBossManager.getInstance().setStatsSet(npc.getId(), info);
 		}
-		else if (npc.getNpcId() == 29069)
+		else if (npc.getId() == 29069)
 		{
 			int countHPHerb = getRandom(6, 18);
 			int countMPHerb = getRandom(6, 18);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java

@@ -191,7 +191,7 @@ public class Baium extends AbstractNpcAI
 			}
 			case "baium_wakeup":
 			{
-				if ((npc != null) && (npc.getNpcId() == LIVE_BAIUM))
+				if ((npc != null) && (npc.getId() == LIVE_BAIUM))
 				{
 					npc.broadcastSocialAction(1);
 					npc.broadcastPacket(new Earthquake(npc.getX(), npc.getY(), npc.getZ(), 40, 5));
@@ -237,7 +237,7 @@ public class Baium extends AbstractNpcAI
 			}
 			case "baium_despawn":
 			{
-				if ((npc != null) && (npc.getNpcId() == LIVE_BAIUM))
+				if ((npc != null) && (npc.getId() == LIVE_BAIUM))
 				{
 					// just in case the zone reference has been lost (somehow...), restore the reference
 					if (_Zone == null)
@@ -296,7 +296,7 @@ public class Baium extends AbstractNpcAI
 			return "<html><body>Angelic Vortex:<br>You may not enter while admin disabled this zone</body></html>";
 		}
 		
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case STONE_BAIUM:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java

@@ -410,7 +410,7 @@ public class Beleth extends AbstractNpcAI
 			return super.onKill(npc, killer, isSummon);
 		}
 		
-		if ((npc.getNpcId() == 29118) && (killer != null))
+		if ((npc.getId() == 29118) && (killer != null))
 		{
 			setBelethKiller(1, killer);
 			GrandBossManager.getInstance().setBossStatus(29118, 3);
@@ -435,7 +435,7 @@ public class Beleth extends AbstractNpcAI
 			spawn(32470, new Location(12470, 215607, -9381, 49152));
 			ThreadPoolManager.getInstance().scheduleGeneral(new Spawn(27), 1000);
 		}
-		else if (npc.getNpcId() == 29119)
+		else if (npc.getId() == 29119)
 		{
 			if (npc.getObjectId() == ALLOW_OBJECT_ID)
 			{
@@ -468,7 +468,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance player, L2Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if ((npc != null) && !npc.isDead() && ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119)) && !npc.isCastingNow() && skill.hasEffectType(L2EffectType.HEAL) && (getRandom(100) < 80))
+		if ((npc != null) && !npc.isDead() && ((npc.getId() == 29118) || (npc.getId() == 29119)) && !npc.isCastingNow() && skill.hasEffectType(L2EffectType.HEAL) && (getRandom(100) < 80))
 		{
 			npc.setTarget(player);
 			npc.doCast(HORN_OF_RISING.getSkill());
@@ -484,7 +484,7 @@ public class Beleth extends AbstractNpcAI
 			return super.onAttack(npc, attacker, damage, isSummon);
 		}
 		
-		if ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119))
+		if ((npc.getId() == 29118) || (npc.getId() == 29119))
 		{
 			if ((npc.getObjectId() == ALLOW_OBJECT_ID) && !ATTACKED)
 			{
@@ -533,7 +533,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
 	{
-		if ((npc != null) && !npc.isDead() && ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119)) && !npc.isCastingNow())
+		if ((npc != null) && !npc.isDead() && ((npc.getId() == 29118) || (npc.getId() == 29119)) && !npc.isCastingNow())
 		{
 			if ((player != null) && !player.isDead())
 			{
@@ -576,7 +576,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		if ((npc != null) && !npc.isDead() && ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119)) && !npc.isCastingNow() && !MOVIE)
+		if ((npc != null) && !npc.isDead() && ((npc.getId() == 29118) || (npc.getId() == 29119)) && !npc.isCastingNow() && !MOVIE)
 		{
 			if (getRandom(100) < 40)
 			{
@@ -595,14 +595,14 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		if ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119))
+		if ((npc.getId() == 29118) || (npc.getId() == 29119))
 		{
 			npc.setRunning();
 			if (!MOVIE && !npc.getKnownList().getKnownPlayersInRadius(300).isEmpty() && (getRandom(100) < 60))
 			{
 				npc.doCast(BLEED.getSkill());
 			}
-			if (npc.getNpcId() == 29118)
+			if (npc.getId() == 29118)
 			{
 				npc.getSpawn().setRespawnDelay(0);// setOnKillDelay
 			}

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java

@@ -149,7 +149,7 @@ public class Core extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
 		{
-			L2Attackable mob = (L2Attackable) addSpawn(npc.getNpcId(), npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0);
+			L2Attackable mob = (L2Attackable) addSpawn(npc.getId(), npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0);
 			mob.setIsRaidMinion(true);
 			Minions.add(mob);
 		}
@@ -171,20 +171,20 @@ public class Core extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		if (npc.getNpcId() == CORE)
+		if (npc.getId() == CORE)
 		{
 			if (_FirstAttacked)
 			{
 				if (getRandom(100) == 0)
 				{
-					npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.REMOVING_INTRUDERS));
+					npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.REMOVING_INTRUDERS));
 				}
 			}
 			else
 			{
 				_FirstAttacked = true;
-				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.A_NON_PERMITTED_TARGET_HAS_BEEN_DISCOVERED));
-				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.INTRUDER_REMOVAL_SYSTEM_INITIATED));
+				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.A_NON_PERMITTED_TARGET_HAS_BEEN_DISCOVERED));
+				npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.INTRUDER_REMOVAL_SYSTEM_INITIATED));
 			}
 		}
 		return super.onAttack(npc, attacker, damage, isSummon);
@@ -193,7 +193,7 @@ public class Core extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == CORE)
 		{
 			int objId = npc.getObjectId();

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java

@@ -143,7 +143,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int npcObjId = npc.getObjectId();
 		if (npcId == DRAGON)
 		{
@@ -176,7 +176,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int npcObjId = npc.getObjectId();
 		if (npcId == DRAGON)
 		{
@@ -206,7 +206,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		int npcObjId = npc.getObjectId();
 		if (npcId == FAFURION)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java

@@ -58,7 +58,7 @@ public class DemonPrince extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equalsIgnoreCase("cast") && (npc != null) && (npc.getNpcId() == FIEND) && !npc.isDead())
+		if (event.equalsIgnoreCase("cast") && (npc != null) && (npc.getId() == FIEND) && !npc.isDead())
 		{
 			npc.doCast(AOE[getRandom(AOE.length)].getSkill());
 		}
@@ -101,7 +101,7 @@ public class DemonPrince extends AbstractNpcAI
 	@Override
 	public final String onSpawn(L2Npc npc)
 	{
-		if (npc.getNpcId() == FIEND)
+		if (npc.getId() == FIEND)
 		{
 			startQuestTimer("cast", 15000, npc, null);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DrChaos.java

@@ -107,7 +107,7 @@ public class DrChaos extends Quest
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (npc.getNpcId() == DR_CHAOS)
+		if (npc.getId() == DR_CHAOS)
 		{
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(96323, -110914, -3328, 0));
 			this.startQuestTimer("1", 3000, npc, player);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java

@@ -94,7 +94,7 @@ public class Epidos extends AbstractNpcAI
 				
 				for (int i = 0; i < minionsCount; i++)
 				{
-					MinionList.spawnMinion((L2MonsterInstance) npc, MINIONS[Arrays.binarySearch(EPIDOSES, npc.getNpcId())]);
+					MinionList.spawnMinion((L2MonsterInstance) npc, MINIONS[Arrays.binarySearch(EPIDOSES, npc.getId())]);
 				}
 				
 				_lastHp.put(npc.getObjectId(), npc.getCurrentHp());

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FleeNpc.java

@@ -50,13 +50,13 @@ public class FleeNpc extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		if ((npc.getNpcId() >= 18150) && (npc.getNpcId() <= 18157))
+		if ((npc.getId() >= 18150) && (npc.getId() <= 18157))
 		{
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((npc.getX() + getRandom(-40, 40)), (npc.getY() + getRandom(-40, 40)), npc.getZ(), npc.getHeading()));
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null, null);
 			return null;
 		}
-		else if ((npc.getNpcId() == 20432) || (npc.getNpcId() == 22228))
+		else if ((npc.getId() == 20432) || (npc.getId() == 22228))
 		{
 			if (getRandom(3) == 2)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/HellboundCore.java

@@ -23,7 +23,6 @@ import ai.npc.AbstractNpcAI;
 import com.l2jserver.gameserver.instancemanager.HellboundManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 
@@ -51,7 +50,7 @@ public class HellboundCore extends AbstractNpcAI
 		{
 			for (L2Character naia : npc.getKnownList().getKnownCharactersInRadius(900))
 			{
-				if ((naia != null) && naia.isMonster() && (((L2MonsterInstance) naia).getNpcId() == NAIA) && !naia.isDead())
+				if ((naia != null) && naia.isMonster() && (naia.getId() == NAIA) && !naia.isDead())
 				{
 					naia.setTarget(npc);
 					naia.doSimultaneousCast(BEAM.getSkill());

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Keltas.java

@@ -162,7 +162,7 @@ public class Keltas extends AbstractNpcAI
 		{
 			if ((_spawnedKeltas != null) && !_spawnedKeltas.isDead())
 			{
-				_spawnedKeltas.broadcastPacket(new NpcSay(_spawnedKeltas.getObjectId(), Say2.NPC_SHOUT, _spawnedKeltas.getNpcId(), NpcStringId.THAT_IS_IT_FOR_TODAYLETS_RETREAT_EVERYONE_PULL_BACK));
+				_spawnedKeltas.broadcastPacket(new NpcSay(_spawnedKeltas.getObjectId(), Say2.NPC_SHOUT, _spawnedKeltas.getId(), NpcStringId.THAT_IS_IT_FOR_TODAYLETS_RETREAT_EVERYONE_PULL_BACK));
 				_spawnedKeltas.deleteMe();
 				_spawnedKeltas.getSpawn().decreaseCount(_spawnedKeltas);
 				despawnMinions();
@@ -186,7 +186,7 @@ public class Keltas extends AbstractNpcAI
 		if (!npc.isTeleporting())
 		{
 			_spawnedKeltas = (L2MonsterInstance) npc;
-			npc.broadcastPacket(new NpcSay(_spawnedKeltas.getObjectId(), Say2.NPC_SHOUT, _spawnedKeltas.getNpcId(), NpcStringId.GUYS_SHOW_THEM_OUR_POWER));
+			npc.broadcastPacket(new NpcSay(_spawnedKeltas.getObjectId(), Say2.NPC_SHOUT, _spawnedKeltas.getId(), NpcStringId.GUYS_SHOW_THEM_OUR_POWER));
 			spawnMinions();
 			startQuestTimer("despawn", 1800000, null, null);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Knoriks.java

@@ -49,7 +49,7 @@ public class Knoriks extends AbstractNpcAI
 			{
 				npc.setScriptValue(1);
 			}
-			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_SHOUT, npc.getNpcId(), NpcStringId.WHOS_THERE_IF_YOU_DISTURB_THE_TEMPER_OF_THE_GREAT_LAND_DRAGON_ANTHARAS_I_WILL_NEVER_FORGIVE_YOU), 1000);
+			npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_SHOUT, npc.getId(), NpcStringId.WHOS_THERE_IF_YOU_DISTURB_THE_TEMPER_OF_THE_GREAT_LAND_DRAGON_ANTHARAS_I_WILL_NEVER_FORGIVE_YOU), 1000);
 		}
 		return super.onAggroRangeEnter(npc, player, isSummon);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java

@@ -243,12 +243,12 @@ public class Orfen extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if (npc.getNpcId() == ORFEN)
+		if (npc.getId() == ORFEN)
 		{
 			L2Character originalCaster = isSummon ? caster.getSummon() : caster;
 			if ((skill.getEffectPoint() > 0) && (getRandom(5) == 0) && npc.isInsideRadius(originalCaster, 1000, false, false))
 			{
-				NpcSay packet = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), TEXT[getRandom(4)]);
+				NpcSay packet = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), TEXT[getRandom(4)]);
 				packet.addStringParameter(caster.getName().toString());
 				npc.broadcastPacket(packet);
 				originalCaster.teleToLocation(npc.getX(), npc.getY(), npc.getZ());
@@ -266,8 +266,8 @@ public class Orfen extends AbstractNpcAI
 		{
 			return super.onFactionCall(npc, caller, attacker, isSummon);
 		}
-		int npcId = npc.getNpcId();
-		int callerId = caller.getNpcId();
+		int npcId = npc.getId();
+		int callerId = caller.getId();
 		if ((npcId == RAIKEL_LEOS) && (getRandom(20) == 0))
 		{
 			npc.setTarget(attacker);
@@ -293,7 +293,7 @@ public class Orfen extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == ORFEN)
 		{
 			if (!_IsTeleported && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2)))
@@ -325,7 +325,7 @@ public class Orfen extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		if (npc.getNpcId() == ORFEN)
+		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
@@ -342,7 +342,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getNpcId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_Minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/OutpostCaptain.java

@@ -77,7 +77,7 @@ public class OutpostCaptain extends AbstractNpcAI
 	{
 		npc.setIsNoRndWalk(true);
 		
-		if (npc.getNpcId() == CAPTAIN)
+		if (npc.getId() == CAPTAIN)
 		{
 			L2DoorInstance door = DoorTable.getInstance().getDoor(20250001);
 			if (door != null)
@@ -85,7 +85,7 @@ public class OutpostCaptain extends AbstractNpcAI
 				door.closeMe();
 			}
 		}
-		else if (npc.getNpcId() == DOORKEEPER)
+		else if (npc.getId() == DOORKEEPER)
 		{
 			startQuestTimer("level_up", 3000, npc, null);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java

@@ -223,7 +223,7 @@ public class QueenAnt extends AbstractNpcAI
 	public String onSpawn(L2Npc npc)
 	{
 		final L2MonsterInstance mob = (L2MonsterInstance) npc;
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case LARVA:
 				mob.setIsImmobilized(true);
@@ -323,7 +323,7 @@ public class QueenAnt extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ranku.java

@@ -54,7 +54,7 @@ public class Ranku extends AbstractNpcAI
 	@Override
 	public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equalsIgnoreCase("checkup") && (npc.getNpcId() == RANKU) && !npc.isDead())
+		if (event.equalsIgnoreCase("checkup") && (npc.getId() == RANKU) && !npc.isDead())
 		{
 			for (L2MonsterInstance minion : ((L2MonsterInstance) npc).getMinionList().getSpawnedMinions())
 			{
@@ -73,13 +73,13 @@ public class Ranku extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, L2Skill skill)
 	{
-		if (npc.getNpcId() == RANKU)
+		if (npc.getId() == RANKU)
 		{
 			for (L2MonsterInstance minion : ((L2MonsterInstance) npc).getMinionList().getSpawnedMinions())
 			{
 				if ((minion != null) && !minion.isDead() && !MY_TRACKING_SET.contains(minion.getObjectId()))
 				{
-					minion.broadcastPacket(new NpcSay(minion.getObjectId(), Say2.NPC_ALL, minion.getNpcId(), NpcStringId.DONT_KILL_ME_PLEASE_SOMETHINGS_STRANGLING_ME));
+					minion.broadcastPacket(new NpcSay(minion.getObjectId(), Say2.NPC_ALL, minion.getId(), NpcStringId.DONT_KILL_ME_PLEASE_SOMETHINGS_STRANGLING_ME));
 					startQuestTimer("checkup", 1000, npc, null);
 					MY_TRACKING_SET.add(minion.getObjectId());
 				}
@@ -91,7 +91,7 @@ public class Ranku extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		if (npc.getNpcId() == MINION)
+		if (npc.getId() == MINION)
 		{
 			if (MY_TRACKING_SET.contains(npc.getObjectId()))
 			{
@@ -105,7 +105,7 @@ public class Ranku extends AbstractNpcAI
 				minion2.teleToLocation(npc.getX(), npc.getY(), npc.getZ());
 			}
 		}
-		else if (npc.getNpcId() == RANKU)
+		else if (npc.getId() == RANKU)
 		{
 			for (L2MonsterInstance minion : ((L2MonsterInstance) npc).getMinionList().getSpawnedMinions())
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/SinWardens.java

@@ -75,7 +75,7 @@ public class SinWardens extends AbstractNpcAI
 				
 				if ((killedCount) == 5)
 				{
-					master.broadcastPacket(new NpcSay(master.getObjectId(), Say2.NPC_ALL, master.getNpcId(), NpcStringId.WE_MIGHT_NEED_NEW_SLAVES_ILL_BE_BACK_SOON_SO_WAIT));
+					master.broadcastPacket(new NpcSay(master.getObjectId(), Say2.NPC_ALL, master.getId(), NpcStringId.WE_MIGHT_NEED_NEW_SLAVES_ILL_BE_BACK_SOON_SO_WAIT));
 					master.doDie(killer);
 					killedMinionsCount.remove(master.getObjectId());
 				}

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java

@@ -141,7 +141,7 @@ public final class Venom extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance talker)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case TELEPORT_CUBE:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java

@@ -622,7 +622,7 @@ public class Zaken extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("CreateOnePrivateEx"))
 		{
-			((L2Attackable) addSpawn(npc.getNpcId(), npc.getX(), npc.getY(), npc.getZ(), 0, false, 0)).setIsRaidMinion(true);
+			((L2Attackable) addSpawn(npc.getId(), npc.getX(), npc.getY(), npc.getZ(), 0, false, 0)).setIsRaidMinion(true);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -634,8 +634,8 @@ public class Zaken extends AbstractNpcAI
 		{
 			return super.onFactionCall(npc, caller, attacker, isSummon);
 		}
-		int npcId = npc.getNpcId();
-		int callerId = caller.getNpcId();
+		int npcId = npc.getId();
+		int callerId = caller.getId();
 		
 		if ((getTimeHour() < 5) && (callerId != ZAKEN) && (npcId == ZAKEN))
 		{
@@ -655,7 +655,7 @@ public class Zaken extends AbstractNpcAI
 	@Override
 	public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
 	{
-		if (npc.getNpcId() == ZAKEN)
+		if (npc.getId() == ZAKEN)
 		{
 			int skillId = skill.getId();
 			if (skillId == 4222)
@@ -780,7 +780,7 @@ public class Zaken extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == ZAKEN)
 		{
 			if (attacker.getMountType() == MountType.STRIDER)
@@ -869,7 +869,7 @@ public class Zaken extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == ZAKEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
@@ -898,7 +898,7 @@ public class Zaken extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == ZAKEN)
 		{
 			if (skill.getEffectPoint() > 0)
@@ -959,7 +959,7 @@ public class Zaken extends AbstractNpcAI
 	@Override
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (npcId == ZAKEN)
 		{
 			if (_Zone.isInsideZone(npc))

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AbstractNpcAI.java

@@ -51,7 +51,7 @@ public abstract class AbstractNpcAI extends L2Script
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		return npc.getNpcId() + ".html";
+		return npc.getId() + ".html";
 	}
 	
 	/**

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java

@@ -61,13 +61,13 @@ public class CastleBlacksmith extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		return (event.equalsIgnoreCase(npc.getNpcId() + "-02.html") && hasRights(player, npc)) ? event : null;
+		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
 	
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		return (hasRights(player, npc)) ? npc.getNpcId() + "-01.html" : "no.html";
+		return (hasRights(player, npc)) ? npc.getId() + "-01.html" : "no.html";
 	}
 	
 	public static void main(String[] args)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java

@@ -487,7 +487,7 @@ public class CastleChamberlain extends AbstractNpcAI
 					}
 					else
 					{
-						htmltext = npc.getNpcId() + "-du.html";
+						htmltext = npc.getId() + "-du.html";
 					}
 				}
 				else
@@ -584,7 +584,7 @@ public class CastleChamberlain extends AbstractNpcAI
 					}
 					else
 					{
-						htmltext = npc.getNpcId() + "-tu.html";
+						htmltext = npc.getId() + "-tu.html";
 					}
 				}
 				else
@@ -884,7 +884,7 @@ public class CastleChamberlain extends AbstractNpcAI
 				}
 				else
 				{
-					htmltext = npc.getNpcId() + "-d.html";
+					htmltext = npc.getId() + "-d.html";
 				}
 				break;
 			}
@@ -1027,7 +1027,7 @@ public class CastleChamberlain extends AbstractNpcAI
 				}
 				else
 				{
-					htmltext = npc.getNpcId() + "-t" + castle.getFunction(Castle.FUNC_TELEPORT).getLvl() + ".html";
+					htmltext = npc.getId() + "-t" + castle.getFunction(Castle.FUNC_TELEPORT).getLvl() + ".html";
 				}
 				break;
 			}
@@ -1172,7 +1172,7 @@ public class CastleChamberlain extends AbstractNpcAI
 				if (isOwner(player, npc) && player.hasClanPrivilege(L2Clan.CP_CS_USE_FUNCTIONS))
 				{
 					final NpcHtmlMessage html = getHtmlPacket(player, npc, "chamberlain-22.html");
-					html.replace("%npcId%", Integer.toString(npc.getNpcId()));
+					html.replace("%npcId%", Integer.toString(npc.getId()));
 					player.sendPacket(html);
 				}
 				else

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java

@@ -94,7 +94,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 				}
 				else
 				{
-					final int listId = Integer.parseInt(npc.getNpcId() + st.nextToken());
+					final int listId = Integer.parseInt(npc.getId() + st.nextToken());
 					((L2MerchantInstance) npc).showBuyWindow(player, listId, false); // NOTE: Not affected by Castle Taxes, baseTax is 20% (done in merchant buylists)
 				}
 				break;

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java

@@ -65,9 +65,9 @@ public class ClanTrader extends AbstractNpcAI
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_ADDED_S1S_POINTS_TO_REPUTATION_SCORE);
 			sm.addNumber(count);
 			player.sendPacket(sm);
-			return npc.getNpcId() + "-04.html";
+			return npc.getId() + "-04.html";
 		}
-		return npc.getNpcId() + "-03.html";
+		return npc.getId() + "-03.html";
 	}
 	
 	@Override
@@ -86,7 +86,7 @@ public class ClanTrader extends AbstractNpcAI
 			}
 			case "repinfo":
 			{
-				htmltext = (player.getClan().getLevel() > 4) ? npc.getNpcId() + "-02.html" : npc.getNpcId() + "-05.html";
+				htmltext = (player.getClan().getLevel() > 4) ? npc.getId() + "-02.html" : npc.getId() + "-05.html";
 				break;
 			}
 			case "exchange-ba":
@@ -113,9 +113,9 @@ public class ClanTrader extends AbstractNpcAI
 	{
 		if (player.isClanLeader() || player.hasClanPrivilege(L2Clan.CP_CL_TROOPS_FAME))
 		{
-			return npc.getNpcId() + ".html";
+			return npc.getId() + ".html";
 		}
-		return npc.getNpcId() + "-01.html";
+		return npc.getId() + "-01.html";
 	}
 	
 	public static void main(String[] args)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FameManager/FameManager.java

@@ -77,16 +77,16 @@ public class FameManager extends AbstractNpcAI
 						player.setFame(player.getFame() - DECREASE_COST);
 						player.setPkKills(player.getPkKills() - 1);
 						player.sendPacket(new UserInfo(player));
-						htmltext = npc.getNpcId() + "-06.html";
+						htmltext = npc.getId() + "-06.html";
 					}
 					else
 					{
-						htmltext = npc.getNpcId() + "-01.html";
+						htmltext = npc.getId() + "-01.html";
 					}
 				}
 				else
 				{
-					htmltext = npc.getNpcId() + "-05.html";
+					htmltext = npc.getId() + "-05.html";
 				}
 				break;
 			}
@@ -100,16 +100,16 @@ public class FameManager extends AbstractNpcAI
 						player.getClan().addReputationScore(50, true);
 						player.sendPacket(new UserInfo(player));
 						player.sendPacket(SystemMessageId.ACQUIRED_50_CLAN_FAME_POINTS);
-						htmltext = npc.getNpcId() + "-04.html";
+						htmltext = npc.getId() + "-04.html";
 					}
 					else
 					{
-						htmltext = npc.getNpcId() + "-01.html";
+						htmltext = npc.getId() + "-01.html";
 					}
 				}
 				else
 				{
-					htmltext = npc.getNpcId() + "-03.html";
+					htmltext = npc.getId() + "-03.html";
 				}
 				break;
 			}
@@ -120,7 +120,7 @@ public class FameManager extends AbstractNpcAI
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		return ((player.getFame() > 0) && (player.getLevel() >= MIN_LVL) && (player.getClassId().level() >= CLASS_LVL)) ? npc.getNpcId() + ".html" : npc.getNpcId() + "-01.html";
+		return ((player.getFame() > 0) && (player.getLevel() >= MIN_LVL) && (player.getClassId().level() >= CLASS_LVL)) ? npc.getId() + ".html" : npc.getId() + "-01.html";
 	}
 	
 	public static void main(String[] args)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java

@@ -149,7 +149,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	{
 		String htmltext = getNoQuestMsg(player);
 		final int AllianceLevel = getAllianceLevel(player);
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case KADUN:
 				htmltext = (AllianceLevel > 0) ? "31370-friend.html" : "31370-no.html";

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java

@@ -121,7 +121,7 @@ public class MercenaryCaptain extends AbstractNpcAI
 				{
 					final String type = st.nextToken();
 					final int price = (type.equals("3")) ? TerritoryWarManager.MINTWBADGEFORBIGSTRIDER : TerritoryWarManager.MINTWBADGEFORSTRIDERS;
-					final int badgeId = NPCS.get(npc.getNpcId());
+					final int badgeId = NPCS.get(npc.getId());
 					if (getQuestItemsCount(player, badgeId) < price)
 					{
 						return "36481-07.html";
@@ -221,7 +221,7 @@ public class MercenaryCaptain extends AbstractNpcAI
 		}
 		else
 		{
-			htmltext = (npc.getCastle().getSiege().getIsInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-06.html" : npc.getNpcId() + "-01.html";
+			htmltext = (npc.getCastle().getSiege().getIsInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-06.html" : npc.getId() + "-01.html";
 		}
 		return htmltext;
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/BirthdayCake.java

@@ -58,7 +58,7 @@ public class BirthdayCake extends AbstractNpcAI
 	private void addTask(L2Npc npc)
 	{
 		final SkillHolder holder;
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case BIRTHDAY_CAKE:
 			{
@@ -101,7 +101,7 @@ public class BirthdayCake extends AbstractNpcAI
 			if (!_npc.isInsideZone(ZoneId.PEACE))
 			{
 				L2Skill skill = _holder.getSkill();
-				switch (_npc.getNpcId())
+				switch (_npc.getId())
 				{
 					case BIRTHDAY_CAKE:
 					{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/CabaleBuffer.java

@@ -98,7 +98,7 @@ public class CabaleBuffer extends AbstractNpcAI
 			if ((_npc != null) && !_npc.isDecayed())
 			{
 				NpcStringId[] messages = ORATOR_MSG;
-				if (_npc.getNpcId() == SevenSigns.PREACHER_NPC_ID)
+				if (_npc.getId() == SevenSigns.PREACHER_NPC_ID)
 				{
 					messages = PREACHER_MSG;
 				}
@@ -150,7 +150,7 @@ public class CabaleBuffer extends AbstractNpcAI
 				
 				final int playerCabal = SevenSigns.getInstance().getPlayerCabal(player.getObjectId());
 				
-				if ((playerCabal == winningCabal) && (playerCabal != SevenSigns.CABAL_NULL) && (_npc.getNpcId() == SevenSigns.ORATOR_NPC_ID))
+				if ((playerCabal == winningCabal) && (playerCabal != SevenSigns.CABAL_NULL) && (_npc.getId() == SevenSigns.ORATOR_NPC_ID))
 				{
 					if (!player.isMageClass())
 					{
@@ -185,7 +185,7 @@ public class CabaleBuffer extends AbstractNpcAI
 						}
 					}
 				}
-				else if ((playerCabal == losingCabal) && (playerCabal != SevenSigns.CABAL_NULL) && (_npc.getNpcId() == SevenSigns.PREACHER_NPC_ID))
+				else if ((playerCabal == losingCabal) && (playerCabal != SevenSigns.CABAL_NULL) && (_npc.getId() == SevenSigns.PREACHER_NPC_ID))
 				{
 					if (!player.isMageClass())
 					{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/Totems.java

@@ -59,7 +59,7 @@ public class Totems extends AbstractNpcAI
 	private void addTask(L2Npc npc)
 	{
 		final SkillHolder holder;
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case TOTEM_OF_BODY:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java

@@ -75,7 +75,7 @@ public final class DelusionTeleport extends AbstractNpcAI
 	{
 		final QuestState st = player.getQuestState(getName());
 		
-		if (npc.getNpcId() == NPCS[0])
+		if (npc.getId() == NPCS[0])
 		{
 			final L2TownZone town = TownManager.getTown(npc.getX(), npc.getY(), npc.getZ());
 			final int townId = ((town == null) ? 0 : town.getTownId());

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java

@@ -37,7 +37,7 @@ public class ElrokiTeleporters extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case ORAHOCHIN:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java

@@ -67,7 +67,7 @@ public class GatekeeperSpirit extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
-		startQuestTimer(Integer.toString(npc.getNpcId()), 10000, npc, killer);
+		startQuestTimer(Integer.toString(npc.getId()), 10000, npc, killer);
 		return super.onKill(npc, killer, isSummon);
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java

@@ -102,7 +102,7 @@ public class GrandBossTeleporters extends AbstractNpcAI
 			return null;
 		}
 		
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case 13001:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java

@@ -62,12 +62,12 @@ public class HuntingGroundsTeleport extends AbstractNpcAI
 		
 		if (playerCabal == SevenSigns.CABAL_NULL)
 		{
-			return Util.contains(DAWN_NPCS, npc.getNpcId()) ? "dawn_tele-no.htm" : "dusk_tele-no.htm";
+			return Util.contains(DAWN_NPCS, npc.getId()) ? "dawn_tele-no.htm" : "dusk_tele-no.htm";
 		}
 		
 		String htmltext = "";
 		final boolean check = ss.isSealValidationPeriod() && (playerCabal == ss.getSealOwner(SevenSigns.SEAL_GNOSIS)) && (ss.getPlayerSeal(player.getObjectId()) == SevenSigns.SEAL_GNOSIS);
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case 31078:
 			case 31085:

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java

@@ -67,7 +67,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		return player.getLevel() >= 20 ? "cant-travel.htm" : npc.getNpcId() + ".htm";
+		return player.getLevel() >= 20 ? "cant-travel.htm" : npc.getId() + ".htm";
 	}
 	
 	private NewbieTravelToken(String name, String descr)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java

@@ -249,7 +249,7 @@ public class OracleTeleport extends AbstractNpcAI
 		String htmltext = "";
 		QuestState st = player.getQuestState(getName());
 		
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (event.equalsIgnoreCase("Return"))
 		{
 			if (Util.contains(TEMPLE_PRIEST, npcId) && (st.getState() == State.STARTED))
@@ -366,7 +366,7 @@ public class OracleTeleport extends AbstractNpcAI
 		String htmltext = "";
 		QuestState st = player.getQuestState(getName());
 		
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		if (Util.contains(TOWN_DAWN, npcId))
 		{
 			st.setState(State.STARTED);

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java

@@ -67,7 +67,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case TRIOLS_MIRROR_1:
 			{
@@ -86,7 +86,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case 32034:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java

@@ -42,7 +42,7 @@ public class StrongholdsTeleports extends AbstractNpcAI
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		return player.getLevel() < 20 ? String.valueOf(npc.getNpcId()) + ".htm" : String.valueOf(npc.getNpcId()) + "-no.htm";
+		return player.getLevel() < 20 ? String.valueOf(npc.getId()) + ".htm" : String.valueOf(npc.getId()) + "-no.htm";
 	}
 	
 	private StrongholdsTeleports(String name, String descr)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java

@@ -79,15 +79,15 @@ public class TeleportToFantasy extends AbstractNpcAI
 			return null;
 		}
 		
-		if (TELEPORTERS.containsKey(npc.getNpcId()))
+		if (TELEPORTERS.containsKey(npc.getId()))
 		{
 			int random_id = getRandom(ISLE_LOCS.length);
 			
 			player.teleToLocation(ISLE_LOCS[random_id], false);
 			st.setState(State.STARTED);
-			st.set("id", String.valueOf(TELEPORTERS.get(npc.getNpcId())));
+			st.set("id", String.valueOf(TELEPORTERS.get(npc.getId())));
 		}
-		else if (npc.getNpcId() == PADDIES)
+		else if (npc.getId() == PADDIES)
 		{
 			if ((st.getState() == State.STARTED) && (st.getInt("id") > 0))
 			{
@@ -98,7 +98,7 @@ public class TeleportToFantasy extends AbstractNpcAI
 			
 			else
 			{
-				player.sendPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.IF_YOUR_MEANS_OF_ARRIVAL_WAS_A_BIT_UNCONVENTIONAL_THEN_ILL_BE_SENDING_YOU_BACK_TO_RUNE_TOWNSHIP_WHICH_IS_THE_NEAREST_TOWN));
+				player.sendPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.IF_YOUR_MEANS_OF_ARRIVAL_WAS_A_BIT_UNCONVENTIONAL_THEN_ILL_BE_SENDING_YOU_BACK_TO_RUNE_TOWNSHIP_WHICH_IS_THE_NEAREST_TOWN));
 				player.teleToLocation(43835, -47749, -792);
 			}
 			st.exitQuest(true);

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java

@@ -69,13 +69,13 @@ public class TeleportToRaceTrack extends AbstractNpcAI
 			return null;
 		}
 		
-		if (TELEPORTERS.containsKey(npc.getNpcId()))
+		if (TELEPORTERS.containsKey(npc.getId()))
 		{
 			st.getPlayer().teleToLocation(12661, 181687, -3560);
 			st.setState(State.STARTED);
-			st.set("id", String.valueOf(TELEPORTERS.get(npc.getNpcId())));
+			st.set("id", String.valueOf(TELEPORTERS.get(npc.getId())));
 		}
-		else if (npc.getNpcId() == RACE_MANAGER)
+		else if (npc.getId() == RACE_MANAGER)
 		{
 			if ((st.getState() == State.STARTED) && (st.getInt("id") > 0))
 			{
@@ -88,7 +88,7 @@ public class TeleportToRaceTrack extends AbstractNpcAI
 			}
 			else
 			{
-				player.sendPacket(new NpcSay(npc.getObjectId(), 0, npc.getNpcId(), "You've arrived here from a different way. I'll send you to Dion Castle Town which is the nearest town."));
+				player.sendPacket(new NpcSay(npc.getObjectId(), 0, npc.getId(), "You've arrived here from a different way. I'll send you to Dion Castle Town which is the nearest town."));
 				st.getPlayer().teleToLocation(15670, 142983, -2700);
 			}
 			st.exitQuest(true);

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java

@@ -107,7 +107,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (Util.contains(MANAGERS, npc.getNpcId()))
+		if (Util.contains(MANAGERS, npc.getId()))
 		{
 			player.teleToLocation(RETURN_LOCS[getRandom(RETURN_LOCS.length)], false);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java

@@ -40,7 +40,7 @@ public class TeleportWithCharm extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case WHIRPY:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java

@@ -46,7 +46,7 @@ public class ToIVortex extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		
 		switch (event)
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java

@@ -87,7 +87,7 @@ public class Warpgate extends AbstractNpcAI
 				return "warpgate-locked.htm";
 			}
 		}
-		return npc.getNpcId() + ".htm";
+		return npc.getId() + ".htm";
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java

@@ -72,14 +72,14 @@ public class TerritoryManagers extends AbstractNpcAI
 			// If the player does not have the second class transfer or is under level 40, it cannot continue.
 			return "36490-08.html";
 		}
-		return npc.getNpcId() + ".html";
+		return npc.getId() + ".html";
 	}
 	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = null;
-		final int npcId = npc.getNpcId();
+		final int npcId = npc.getId();
 		final int itemId = 13757 + (npcId - 36490);
 		final int territoryId = 81 + (npcId - 36490);
 		switch (event)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java

@@ -78,7 +78,7 @@ public class HealerTrainer extends AbstractNpcAI
 			{
 				if (!npc.getTemplate().canTeach(player.getClassId()))
 				{
-					htmltext = npc.getNpcId() + "-noteach.html";
+					htmltext = npc.getId() + "-noteach.html";
 					break;
 				}
 				if ((player.getLevel() < MIN_LEVEL) || (player.getClassId().level() < MIN_CLASS_LEVEL))

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java

@@ -149,7 +149,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	{
 		String htmltext = getNoQuestMsg(player);
 		final int AllianceLevel = getAllianceLevel(player);
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case ASHAS:
 				htmltext = (AllianceLevel < 0) ? "31377-friend.html" : "31377-no.html";

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java

@@ -73,14 +73,14 @@ public final class FirstClassTransferTalk extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		String htmltext = npc.getNpcId() + "_";
+		String htmltext = npc.getId() + "_";
 		
-		if (MASTERS.get(npc.getNpcId()) != player.getRace())
+		if (MASTERS.get(npc.getId()) != player.getRace())
 		{
 			return htmltext += "no.html";
 		}
 		
-		switch (MASTERS.get(npc.getNpcId()))
+		switch (MASTERS.get(npc.getId()))
 		{
 			case Human:
 			{

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java

@@ -217,17 +217,17 @@ public class WeaverOlf extends AbstractNpcAI
 					}
 					else
 					{
-						npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), NpcStringId.WHAT_A_PREDICAMENT_MY_ATTEMPTS_WERE_UNSUCCESSFUL));
+						npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.WHAT_A_PREDICAMENT_MY_ATTEMPTS_WERE_UNSUCCESSFUL));
 					}
 				}
 				else
 				{
-					return npc.getNpcId() + "-low.htm";
+					return npc.getId() + "-low.htm";
 				}
 			}
 			else
 			{
-				return npc.getNpcId() + "-no.htm";
+				return npc.getId() + "-no.htm";
 			}
 			return super.onAdvEvent(event, npc, player);
 		}
@@ -237,7 +237,7 @@ public class WeaverOlf extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		return npc.getNpcId() + "-1.htm";
+		return npc.getId() + "-1.htm";
 	}
 	
 	public static void main(String[] args)

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java

@@ -123,7 +123,7 @@ public final class WyvernManager extends AbstractNpcAI
 	
 	private boolean isOwnerClan(L2Npc npc, L2PcInstance player)
 	{
-		switch (MANAGERS.get(npc.getNpcId()))
+		switch (MANAGERS.get(npc.getId()))
 		{
 			case CASTLE:
 			{
@@ -158,7 +158,7 @@ public final class WyvernManager extends AbstractNpcAI
 	
 	private boolean isInSiege(L2Npc npc)
 	{
-		switch (MANAGERS.get(npc.getNpcId()))
+		switch (MANAGERS.get(npc.getId()))
 		{
 			case CASTLE:
 			{
@@ -182,7 +182,7 @@ public final class WyvernManager extends AbstractNpcAI
 	
 	private String getResidenceName(L2Npc npc)
 	{
-		switch (MANAGERS.get(npc.getNpcId()))
+		switch (MANAGERS.get(npc.getId()))
 		{
 			case CASTLE:
 			{
@@ -229,7 +229,7 @@ public final class WyvernManager extends AbstractNpcAI
 				{
 					htmltext = replaceAll(npc, player.getHtmlPrefix());
 				}
-				else if ((MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
+				else if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
 				{
 					htmltext = "wyvernmanager-dusk.html";
 				}
@@ -241,7 +241,7 @@ public final class WyvernManager extends AbstractNpcAI
 			}
 			case "Help":
 			{
-				htmltext = MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE ? replacePart(player.getHtmlPrefix(), "wyvernmanager-03.html") : replacePart(player.getHtmlPrefix(), "wyvernmanager-03b.html");
+				htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player.getHtmlPrefix(), "wyvernmanager-03.html") : replacePart(player.getHtmlPrefix(), "wyvernmanager-03b.html");
 				break;
 			}
 			case "RideWyvern":
@@ -253,7 +253,7 @@ public final class WyvernManager extends AbstractNpcAI
 						player.sendMessage("You cannot summon wyvern while in siege.");
 						return null;
 					}
-					if ((MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
+					if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
 					{
 						htmltext = "wyvernmanager-dusk.html";
 					}
@@ -288,7 +288,7 @@ public final class WyvernManager extends AbstractNpcAI
 			}
 			else
 			{
-				if ((MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
+				if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
 				{
 					htmltext = "wyvernmanager-dusk.html";
 				}

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ZealotOfShilen/ZealotOfShilen.java

@@ -85,7 +85,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		return (npc.isAttackingNow()) ? "32628-01.html" : npc.getNpcId() + ".html";
+		return (npc.isAttackingNow()) ? "32628-01.html" : npc.getId() + ".html";
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java

@@ -62,11 +62,11 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		if (npc.getNpcId() == MIKHAIL)
+		if (npc.getId() == MIKHAIL)
 		{
 			broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.GLORY_TO_ADEN_THE_KINGDOM_OF_THE_LION_GLORY_TO_SIR_GUSTAV_OUR_IMMORTAL_LORD);
 		}
-		else if (npc.getNpcId() == DIETRICH)
+		else if (npc.getId() == DIETRICH)
 		{
 			broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.SOLDIERS_OF_GUSTAV_GO_FORTH_AND_DESTROY_THE_INVADERS);
 		}
@@ -119,7 +119,7 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
 		
 		_missionAccomplished = true;
 		
-		if (npc.getNpcId() == GUSTAV)
+		if (npc.getId() == GUSTAV)
 		{
 			synchronized (this)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java

@@ -69,15 +69,15 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		if (npc.getNpcId() == LIDIA)
+		if (npc.getId() == LIDIA)
 		{
 			broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.HMM_THOSE_WHO_ARE_NOT_OF_THE_BLOODLINE_ARE_COMING_THIS_WAY_TO_TAKE_OVER_THE_CASTLE_HUMPH_THE_BITTER_GRUDGES_OF_THE_DEAD_YOU_MUST_NOT_MAKE_LIGHT_OF_THEIR_POWER);
 		}
-		else if (npc.getNpcId() == ALFRED)
+		else if (npc.getId() == ALFRED)
 		{
 			broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.HEH_HEH_I_SEE_THAT_THE_FEAST_HAS_BEGUN_BE_WARY_THE_CURSE_OF_THE_HELLMANN_FAMILY_HAS_POISONED_THIS_LAND);
 		}
-		else if (npc.getNpcId() == GISELLE)
+		else if (npc.getId() == GISELLE)
 		{
 			broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.ARISE_MY_FAITHFUL_SERVANTS_YOU_MY_PEOPLE_WHO_HAVE_INHERITED_THE_BLOOD_IT_IS_THE_CALLING_OF_MY_DAUGHTER_THE_FEAST_OF_BLOOD_WILL_NOW_BEGIN);
 		}
@@ -122,7 +122,7 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
 			return null;
 		}
 		
-		final int npcId = npc.getNpcId();
+		final int npcId = npc.getId();
 		
 		if ((npcId == ALFRED) || (npcId == GISELLE))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -331,7 +331,7 @@ public class RainbowSpringsChateau extends Quest
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
 		String html = "";
-		final int npcId = npc.getNpcId();
+		final int npcId = npc.getId();
 		if (npcId == MESSENGER)
 		{
 			final String main = (_rainbow.getOwnerId() > 0) ? "messenger_yetti001.htm" : "messenger_yetti001a.htm";
@@ -385,7 +385,7 @@ public class RainbowSpringsChateau extends Quest
 	{
 		String html = event;
 		final L2Clan clan = player.getClan();
-		switch (npc.getNpcId())
+		switch (npc.getId())
 		{
 			case MESSENGER:
 				switch (event)
@@ -631,7 +631,7 @@ public class RainbowSpringsChateau extends Quest
 			return null;
 		}
 		
-		final int npcId = npc.getNpcId();
+		final int npcId = npc.getId();
 		final int index = _acceptedClans.indexOf(clan);
 		
 		if (npcId == CHEST)
@@ -668,15 +668,13 @@ public class RainbowSpringsChateau extends Quest
 			return null;
 		}
 		
-		int yeti = ((L2Npc) target).getNpcId();
-		
+		int yeti = target.getId();
 		if (!isYetiTarget(yeti))
 		{
 			return null;
 		}
 		
 		final L2Clan clan = player.getClan();
-		
 		if ((clan == null) || !_acceptedClans.contains(clan))
 		{
 			return null;
@@ -842,7 +840,7 @@ public class RainbowSpringsChateau extends Quest
 			_usedTextPassages.put(message, new ArrayList<L2Clan>());
 			int shout = Say2.NPC_SHOUT;
 			int objId = npc.getObjectId();
-			NpcSay say = new NpcSay(objId, shout, npc.getNpcId(), message);
+			NpcSay say = new NpcSay(objId, shout, npc.getId(), message);
 			npc.broadcastPacket(say);
 		}
 	}

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java

@@ -136,7 +136,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		/*
 		 * if(player.getQuestState(qn) == null) newQuestState(player);
 		 */
-		if (npc.getNpcId() == MESSENGER)
+		if (npc.getId() == MESSENGER)
 		{
 			if (!checkIsAttacker(player.getClan()))
 			{
@@ -153,7 +153,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		else
 		{
-			int index = npc.getNpcId() - TELEPORT_1;
+			int index = npc.getId() - TELEPORT_1;
 			if ((index == 0) && _firstPhase)
 			{
 				html = "teleporter_notyet.htm";
@@ -370,7 +370,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	{
 		if (_hall.isInSiege())
 		{
-			final int npcId = npc.getNpcId();
+			final int npcId = npc.getId();
 			for (int keys : _data.keySet())
 			{
 				if (_data.get(keys).npc == npcId)

L2J_DataPack_BETA/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java

@@ -101,17 +101,17 @@ public class EchoCrystals extends Quest
 				
 				if (!st.hasQuestItems(score))
 				{
-					htmltext = npc.getNpcId() + "-" + noscore + ".htm";
+					htmltext = npc.getId() + "-" + noscore + ".htm";
 				}
 				else if (st.getQuestItemsCount(ADENA) < COST)
 				{
-					htmltext = npc.getNpcId() + "-" + noadena + ".htm";
+					htmltext = npc.getId() + "-" + noadena + ".htm";
 				}
 				else
 				{
 					st.takeItems(ADENA, COST);
 					st.giveItems(crystal, 1);
-					htmltext = npc.getNpcId() + "-" + ok + ".htm";
+					htmltext = npc.getId() + "-" + ok + ".htm";
 				}
 			}
 		}

L2J_DataPack_BETA/dist/game/data/scripts/custom/Listeners/Listeners.java

@@ -86,7 +86,7 @@ public class Listeners extends L2Script
 		List<Integer> items = new ArrayList<>();
 		for (L2ItemInstance item : player.getInventory().getItems())
 		{
-			items.add(item.getItemId());
+			items.add(item.getId());
 		}
 		addItemTracker(items);
 		addTransformNotify(player);

L2J_DataPack_BETA/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java

@@ -303,7 +303,7 @@ public class NpcLocationInfo extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		
 		if (Util.contains(NPC, npcId))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java

@@ -208,8 +208,8 @@ public class RaidbossInfo extends Quest
 		// Add all Raid Bosses to RAIDS list
 		for (L2NpcTemplate raid : NpcTable.getInstance().getAllNpcOfClassType("L2RaidBoss"))
 		{
-			final L2Spawn spawn = SpawnTable.getInstance().getFirstSpawn(raid.getNpcId());
-			RADAR.put(raid.getNpcId(), spawn != null ? spawn.getLocation() : new Location(0, 0, 0));
+			final L2Spawn spawn = SpawnTable.getInstance().getFirstSpawn(raid.getId());
+			RADAR.put(raid.getId(), spawn != null ? spawn.getLocation() : new Location(0, 0, 0));
 		}
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java

@@ -348,7 +348,7 @@ public final class SubClassSkills extends Quest
 							}
 							if (item != null)
 							{
-								if (!Util.contains(_certItemsByLevel[i], item.getItemId()))
+								if (!Util.contains(_certItemsByLevel[i], item.getId()))
 								{
 									Util.handleIllegalPlayerAction(player, "Invalid cert variable:" + qName + "=" + qValue + " - item found but does not match certificate level", 0);
 								}
@@ -452,7 +452,7 @@ public final class SubClassSkills extends Quest
 		FastList<L2ItemInstance> tmp = null;
 		for (L2ItemInstance i : player.getInventory().getItems())
 		{
-			if ((i != null) && (Arrays.binarySearch(_allCertItemIds, i.getItemId()) >= 0))
+			if ((i != null) && (Arrays.binarySearch(_allCertItemIds, i.getId()) >= 0))
 			{
 				if (tmp == null)
 				{

L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java

@@ -122,7 +122,7 @@ public class FreyaCelebration extends LongTimeEvent
 			return null;
 		}
 		
-		if ((npc.getNpcId() == FREYA) && Util.contains(targets, npc) && Util.contains(SKILLS, skill.getId()))
+		if ((npc.getId() == FREYA) && Util.contains(targets, npc) && Util.contains(SKILLS, skill.getId()))
 		{
 			if (getRandom(100) < 5)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java

@@ -106,7 +106,7 @@ public class HeavyMedal extends LongTimeEvent
 		}
 		else if (event.equalsIgnoreCase("talk"))
 		{
-			htmltext = String.valueOf(npc.getNpcId()) + "-lvl-" + String.valueOf(level) + ".htm";
+			htmltext = String.valueOf(npc.getId()) + "-lvl-" + String.valueOf(level) + ".htm";
 		}
 		return htmltext;
 	}
@@ -118,7 +118,7 @@ public class HeavyMedal extends LongTimeEvent
 		{
 			newQuestState(player);
 		}
-		return npc.getNpcId() + ".htm";
+		return npc.getId() + ".htm";
 	}
 	
 	public int checkLevel(QuestState st)

L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java

@@ -279,7 +279,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 		{
 			newQuestState(player);
 		}
-		return npc.getNpcId() + ".htm";
+		return npc.getId() + ".htm";
 	}
 	
 	public static void main(String[] args)

L2J_DataPack_BETA/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java

@@ -76,7 +76,7 @@ public class TheValentineEvent extends LongTimeEvent
 		{
 			newQuestState(player);
 		}
-		return npc.getNpcId() + ".htm";
+		return npc.getId() + ".htm";
 	}
 	
 	public static void main(String[] args)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java

@@ -43,7 +43,7 @@ public class L2DoorInstanceActionShift implements IActionHandler
 			html.replace("%hp%", String.valueOf((int) door.getCurrentHp()));
 			html.replace("%hpmax%", String.valueOf(door.getMaxHp()));
 			html.replace("%objid%", String.valueOf(target.getObjectId()));
-			html.replace("%doorid%", String.valueOf(door.getDoorId()));
+			html.replace("%doorid%", String.valueOf(door.getId()));
 			
 			html.replace("%minx%", String.valueOf(door.getX(0)));
 			html.replace("%miny%", String.valueOf(door.getY(0)));

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.instancemanager.MercTicketManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 public class L2ItemInstanceAction implements IActionHandler
 {
@@ -33,7 +32,7 @@ public class L2ItemInstanceAction implements IActionHandler
 	{
 		// this causes the validate position handler to do the pickup if the location is reached.
 		// mercenary tickets can only be picked up by the castle owner.
-		final int castleId = MercTicketManager.getInstance().getTicketCastleId(((L2ItemInstance) target).getItemId());
+		final int castleId = MercTicketManager.getInstance().getTicketCastleId(target.getId());
 		
 		if ((castleId > 0) && (!activeChar.isCastleLord(castleId) || activeChar.isInParty()))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java

@@ -34,7 +34,7 @@ public class L2ItemInstanceActionShift implements IActionHandler
 		if (activeChar.getAccessLevel().isGm())
 		{
 			NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
-			final String html1 = StringUtil.concat("<html><body><center><font color=\"LEVEL\">Item Info</font></center><br><table border=0>", "<tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Item ID: </td><td>", String.valueOf(((L2ItemInstance) target).getItemId()), "</td></tr><tr><td>Owner ID: </td><td>", String.valueOf(((L2ItemInstance) target).getOwnerId()), "</td></tr><tr><td>Location: </td><td>", String.valueOf(((L2ItemInstance) target).getLocation()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>");
+			final String html1 = StringUtil.concat("<html><body><center><font color=\"LEVEL\">Item Info</font></center><br><table border=0>", "<tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Item ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Owner ID: </td><td>", String.valueOf(((L2ItemInstance) target).getOwnerId()), "</td></tr><tr><td>Location: </td><td>", String.valueOf(((L2ItemInstance) target).getLocation()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>");
 			html.setHtml(html1);
 			activeChar.sendPacket(html);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java

@@ -68,10 +68,10 @@ public class L2NpcActionShift implements IActionHandler
 			
 			html.replace("%objid%", String.valueOf(target.getObjectId()));
 			html.replace("%class%", target.getClass().getSimpleName());
-			html.replace("%id%", String.valueOf(((L2Npc) target).getTemplate().getNpcId()));
+			html.replace("%id%", String.valueOf(((L2Npc) target).getTemplate().getId()));
 			html.replace("%lvl%", String.valueOf(((L2Npc) target).getTemplate().getLevel()));
 			html.replace("%name%", String.valueOf(((L2Npc) target).getTemplate().getName()));
-			html.replace("%tmplid%", String.valueOf(((L2Npc) target).getTemplate().getNpcId()));
+			html.replace("%tmplid%", String.valueOf(((L2Npc) target).getTemplate().getId()));
 			html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
 			html.replace("%hp%", String.valueOf((int) ((L2Character) target).getCurrentHp()));
 			html.replace("%hpmax%", String.valueOf(((L2Character) target).getMaxHp()));

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java

@@ -36,7 +36,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
 		final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target;
 		if (staticObject.getType() < 0)
 		{
-			_log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getStaticObjectId());
+			_log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId());
 		}
 		
 		// Check if the L2PcInstance already target the L2NpcInstance
@@ -57,7 +57,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
 			{
 				if (staticObject.getType() == 2)
 				{
-					final String filename = (staticObject.getStaticObjectId() == 24230101) ? "data/html/signboards/tomb_of_crystalgolem.htm" : "data/html/signboards/pvp_signboard.htm";
+					final String filename = (staticObject.getId() == 24230101) ? "data/html/signboards/tomb_of_crystalgolem.htm" : "data/html/signboards/pvp_signboard.htm";
 					final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
 					final NpcHtmlMessage html = new NpcHtmlMessage(staticObject.getObjectId());
 					

L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java

@@ -38,7 +38,7 @@ public class L2StaticObjectInstanceActionShift implements IActionHandler
 			activeChar.sendPacket(new StaticObject((L2StaticObjectInstance) target));
 			
 			NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
-			html.setHtml(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getStaticObjectId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
+			html.setHtml(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
 			activeChar.sendPacket(html);
 		}
 		return true;