Fix for admin castle command target.
Contributed by darkillust.
This commit is contained in:
parent
8b5295b9b5
commit
891e4cc588
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
@ -76,7 +76,7 @@ public class AdminCastle implements IAdminCommandHandler
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final String action = st.nextToken();
|
final String action = st.nextToken();
|
||||||
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getActingPlayer() : null;
|
final PlayerInstance target = checkTarget(activeChar) ? activeChar.getTarget().getActingPlayer() : null;
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case "showRegWindow":
|
case "showRegWindow":
|
||||||
|
Loading…
Reference in New Issue
Block a user