lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced instanceof L2Summon with isSummon method.

Browse Source
This commit is contained in:
MobiusDev
2018-07-02 01:03:46 +00:00
parent 0b09d49f8d
commit 856ff5ebdc
17 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -739,7 +739,7 @@ public class AdminEditChar implements IAdminCommandHandler
else if (command.startsWith("admin_summon_info"))
{
final L2Object target = activeChar.getTarget();
if (target instanceof L2Summon)
if ((target != null) && target.isSummon())
{
gatherSummonInfo((L2Summon) target, activeChar);
}
@@ -751,7 +751,7 @@ public class AdminEditChar implements IAdminCommandHandler
else if (command.startsWith("admin_unsummon"))
{
final L2Object target = activeChar.getTarget();
if (target instanceof L2Summon)
if ((target != null) && target.isSummon())
{
((L2Summon) target).unSummon(((L2Summon) target).getOwner());
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java vendored
View File

@@ -21,7 +21,6 @@ import java.util.StringTokenizer;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.instancemanager.InstanceManager;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.instancezone.Instance;
import com.l2jmobius.gameserver.model.instancezone.InstanceWorld;
@@ -108,7 +107,7 @@ public class AdminInstance implements IAdminCommandHandler
}
final L2Object target = activeChar.getTarget();
if ((target == null) || (target instanceof L2Summon)) // Don't separate summons from masters
if ((target == null) || target.isSummon()) // Don't separate summons from masters
{
BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
return false;