From 891e4cc588ea8812796cde14b3f275e586bc0176 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 26 Mar 2020 09:44:50 +0000
Subject: [PATCH] Fix for admin castle command target. Contributed by
 darkillust.

---
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 .../data/scripts/handlers/admincommandhandlers/AdminCastle.java | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
index 2be27b2add..1dbee2812d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java
@@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
 				else
 				{
 					final String action = st.nextToken();
-					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
+					final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
 					switch (action)
 					{
 						case "showRegWindow":