From 13c6c9cc8d8fba99e60b5b182fb9ae5deee0be74 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 5 Aug 2019 10:47:09 +0000
Subject: [PATCH] Use SkillCaster to trigger Arena Manager buffs.

---
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 .../data/scripts/ai/others/ArenaManager/ArenaManager.java | 8 ++++----
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8caf8b6641..c8d5cabb78 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skills.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
@@ -34,8 +35,8 @@ public class ArenaManager extends AbstractNpcAI
 	// NPCs
 	private static final int[] ARENA_MANAGER =
 	{
-		31226, // Arena Director (MDT)
-		31225, // Arena Manager (Coliseum)
+		31225, // Arena Director (MDT)
+		31226, // Arena Manager (Coliseum)
 	};
 	// Skills
 	private static final SkillHolder[] BUFFS =
@@ -97,10 +98,9 @@ public class ArenaManager extends AbstractNpcAI
 				if (player.getAdena() >= BUFF_COST)
 				{
 					takeItems(player, Inventory.ADENA_ID, BUFF_COST);
-					npc.setTarget(player);
 					for (SkillHolder skill : BUFFS)
 					{
-						npc.doCast(skill.getSkill());
+						SkillCaster.triggerCast(npc, player, skill.getSkill());
 					}
 				}
 				else