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

Replaced instanceof L2DoorInstance with isDoor method.

Browse Source
This commit is contained in:
MobiusDev
2018-07-02 01:36:25 +00:00
parent bd285c1368
commit 11760710ee
18 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java vendored
View File

@@ -118,7 +118,7 @@ public class AdminDoorControl implements IAdminCommandHandler
else if (command.equals("admin_open"))
{
final L2Object target = activeChar.getTarget();
if (target instanceof L2DoorInstance)
if ((target != null) && target.isDoor())
{
((L2DoorInstance) target).openMe();
}
@@ -130,7 +130,7 @@ public class AdminDoorControl implements IAdminCommandHandler
else if (command.equals("admin_close"))
{
final L2Object target = activeChar.getTarget();
if (target instanceof L2DoorInstance)
if ((target != null) && target.isDoor())
{
((L2DoorInstance) target).closeMe();
}

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/StaticObjectScope.java vendored
View File

@@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.handler.IAffectScopeHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2StaticObjectInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.targets.AffectScope;
@@ -57,7 +56,7 @@ public class StaticObjectScope implements IAffectScopeHandler
return false;
}
if (!(c instanceof L2DoorInstance) && !(c instanceof L2StaticObjectInstance))
if (!c.isDoor() && !(c instanceof L2StaticObjectInstance))
{
return false;
}