From 014e6ddfdbda9d31f2943153c475836c770f20dd Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 26 Apr 2018 11:34:03 +0000
Subject: [PATCH] Minor timer improvements.

---
 .../data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java    | 8 ++++----
 .../scripts/ai/areas/TalkingIsland/YeSagiraGuards.java    | 5 +++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 .../data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java    | 8 ++++----
 .../scripts/ai/areas/TalkingIsland/YeSagiraGuards.java    | 5 +++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 .../data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java    | 8 ++++----
 .../scripts/ai/areas/TalkingIsland/YeSagiraGuards.java    | 5 +++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 .../data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java    | 8 ++++----
 .../scripts/ai/areas/TalkingIsland/YeSagiraGuards.java    | 5 +++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 .../dist/game/data/scripts/ai/others/SiegeGuards.java     | 4 ++--
 15 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 5a6428a34d..caac4f6dad 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
  */
 public final class HillsOfGold extends AbstractNpcAI
 {
-	// Npcs
+	// NPCs
 	private static final int GOLEM_OF_REPAIRS = 19309;
 	private static final int EXCAVATOR_GOLEM = 19312;
 	private static final int DRILL_GOLEM = 19310;
@@ -59,7 +59,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPICULA_AGGRO") && (npc != null) && !npc.isDead())
+		if ((npc != null) && !npc.isDead())
 		{
 			L2World.getInstance().forEachVisibleObject(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby ->
 			{
@@ -73,7 +73,7 @@ public final class HillsOfGold extends AbstractNpcAI
 					return;
 				}
 			});
-			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -98,7 +98,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	{
 		if ((npc.getId() == SPICULA_1) || (npc.getId() == SPICULA_2))
 		{
-			startQuestTimer("SPICULA_AGGRO", 5000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		}
 		else
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 4d2ad5e9d1..162afb2aa7 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -46,7 +46,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
+		if ((npc != null) && !npc.isDead() && !npc.isInCombat())
 		{
 			final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
 			if (!nearbyMonsters.isEmpty())
@@ -57,6 +57,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 					npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
 				}
 			}
+			startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -65,7 +66,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	public String onSpawn(L2Npc npc)
 	{
 		npc.setIsInvul(true);
-		startQuestTimer("GUARD_AGGRO", 5000, npc, null, true);
+		startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java
index b14c124bd3..20b234ce62 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -122,7 +122,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -149,7 +149,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 5a6428a34d..caac4f6dad 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
  */
 public final class HillsOfGold extends AbstractNpcAI
 {
-	// Npcs
+	// NPCs
 	private static final int GOLEM_OF_REPAIRS = 19309;
 	private static final int EXCAVATOR_GOLEM = 19312;
 	private static final int DRILL_GOLEM = 19310;
@@ -59,7 +59,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPICULA_AGGRO") && (npc != null) && !npc.isDead())
+		if ((npc != null) && !npc.isDead())
 		{
 			L2World.getInstance().forEachVisibleObject(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby ->
 			{
@@ -73,7 +73,7 @@ public final class HillsOfGold extends AbstractNpcAI
 					return;
 				}
 			});
-			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -98,7 +98,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	{
 		if ((npc.getId() == SPICULA_1) || (npc.getId() == SPICULA_2))
 		{
-			startQuestTimer("SPICULA_AGGRO", 5000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		}
 		else
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 4d2ad5e9d1..162afb2aa7 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -46,7 +46,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
+		if ((npc != null) && !npc.isDead() && !npc.isInCombat())
 		{
 			final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
 			if (!nearbyMonsters.isEmpty())
@@ -57,6 +57,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 					npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
 				}
 			}
+			startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -65,7 +66,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	public String onSpawn(L2Npc npc)
 	{
 		npc.setIsInvul(true);
-		startQuestTimer("GUARD_AGGRO", 5000, npc, null, true);
+		startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java
index b14c124bd3..20b234ce62 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -122,7 +122,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -149,7 +149,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 5a6428a34d..caac4f6dad 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
  */
 public final class HillsOfGold extends AbstractNpcAI
 {
-	// Npcs
+	// NPCs
 	private static final int GOLEM_OF_REPAIRS = 19309;
 	private static final int EXCAVATOR_GOLEM = 19312;
 	private static final int DRILL_GOLEM = 19310;
@@ -59,7 +59,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPICULA_AGGRO") && (npc != null) && !npc.isDead())
+		if ((npc != null) && !npc.isDead())
 		{
 			L2World.getInstance().forEachVisibleObject(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby ->
 			{
@@ -73,7 +73,7 @@ public final class HillsOfGold extends AbstractNpcAI
 					return;
 				}
 			});
-			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -98,7 +98,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	{
 		if ((npc.getId() == SPICULA_1) || (npc.getId() == SPICULA_2))
 		{
-			startQuestTimer("SPICULA_AGGRO", 5000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		}
 		else
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 4d2ad5e9d1..162afb2aa7 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -46,7 +46,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
+		if ((npc != null) && !npc.isDead() && !npc.isInCombat())
 		{
 			final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
 			if (!nearbyMonsters.isEmpty())
@@ -57,6 +57,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 					npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
 				}
 			}
+			startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -65,7 +66,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	public String onSpawn(L2Npc npc)
 	{
 		npc.setIsInvul(true);
-		startQuestTimer("GUARD_AGGRO", 5000, npc, null, true);
+		startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java
index b14c124bd3..20b234ce62 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -122,7 +122,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -149,7 +149,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 5a6428a34d..caac4f6dad 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
  */
 public final class HillsOfGold extends AbstractNpcAI
 {
-	// Npcs
+	// NPCs
 	private static final int GOLEM_OF_REPAIRS = 19309;
 	private static final int EXCAVATOR_GOLEM = 19312;
 	private static final int DRILL_GOLEM = 19310;
@@ -59,7 +59,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPICULA_AGGRO") && (npc != null) && !npc.isDead())
+		if ((npc != null) && !npc.isDead())
 		{
 			L2World.getInstance().forEachVisibleObject(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby ->
 			{
@@ -73,7 +73,7 @@ public final class HillsOfGold extends AbstractNpcAI
 					return;
 				}
 			});
-			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -98,7 +98,7 @@ public final class HillsOfGold extends AbstractNpcAI
 	{
 		if ((npc.getId() == SPICULA_1) || (npc.getId() == SPICULA_2))
 		{
-			startQuestTimer("SPICULA_AGGRO", 5000, npc, null);
+			startQuestTimer("SPICULA_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		}
 		else
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 4d2ad5e9d1..162afb2aa7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -46,7 +46,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
+		if ((npc != null) && !npc.isDead() && !npc.isInCombat())
 		{
 			final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
 			if (!nearbyMonsters.isEmpty())
@@ -57,6 +57,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 					npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
 				}
 			}
+			startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 10000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -65,7 +66,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
 	public String onSpawn(L2Npc npc)
 	{
 		npc.setIsInvul(true);
-		startQuestTimer("GUARD_AGGRO", 5000, npc, null, true);
+		startQuestTimer("GUARD_AGGRO" + npc.getObjectId(), 5000, npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java
index b14c124bd3..20b234ce62 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -122,7 +122,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -149,7 +149,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java
index 1e72f3ad1b..2cb780e03e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -122,7 +122,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -149,7 +149,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java
index bbc52c5ec0..1019c20ce9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -96,7 +96,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -123,7 +123,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java
index bbc52c5ec0..1019c20ce9 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -96,7 +96,7 @@ public class SiegeGuards extends AbstractNpcAI
 					}
 				}
 			}
-			startQuestTimer("AGGRO_CHECK" + npc.getId(), 3000, npc, null);
+			startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), 3000, npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
@@ -123,7 +123,7 @@ public class SiegeGuards extends AbstractNpcAI
 		final Castle castle = npc.getCastle();
 		final Fort fortress = npc.getFort();
 		npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
-		startQuestTimer("AGGRO_CHECK" + npc.getId(), getRandom(1000, 10000), npc, null);
+		startQuestTimer("AGGRO_CHECK" + npc.getObjectId(), getRandom(1000, 10000), npc, null);
 		return super.onSpawn(npc);
 	}