From 4fbc332c9705d5fae318caa93e09ac1ae7f96ab9 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 8 Feb 2019 02:33:02 +0000 Subject: [PATCH] Addition of important L2Object missing overrides. --- .../l2jmobius/gameserver/model/L2Object.java | 20 ------------------- .../gameserver/model/actor/L2Character.java | 6 ++++++ .../gameserver/model/actor/L2Playable.java | 6 ++++++ .../gameserver/model/actor/L2Summon.java | 6 ++++++ .../actor/instance/L2ArtefactInstance.java | 6 ++++++ .../model/actor/instance/L2BoatInstance.java | 6 ++++++ .../model/actor/instance/L2DoorInstance.java | 6 ++++++ .../model/actor/instance/L2ItemInstance.java | 6 ++++++ .../actor/instance/L2MinionInstance.java | 6 ++++++ .../actor/instance/L2MonsterInstance.java | 6 ++++++ .../model/actor/instance/L2NpcInstance.java | 6 ++++++ .../model/actor/instance/L2PetInstance.java | 6 ++++++ 12 files changed, 66 insertions(+), 20 deletions(-) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java index ee2560126e..4b8bfcca37 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java @@ -631,16 +631,6 @@ public abstract class L2Object return false; } - public boolean isBoss() - { - return false; - } - - public boolean isTrap() - { - return false; - } - public boolean isDoor() { return false; @@ -651,21 +641,11 @@ public abstract class L2Object return false; } - public boolean isSiegeGuard() - { - return false; - } - public boolean isBoat() { return false; } - public boolean isVehicle() - { - return false; - } - public boolean isMinion() { return false; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java index ba010f3dcb..ebd5322bab 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -10497,4 +10497,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder { _cursorKeyMovement = value; } + + @Override + public boolean isCharacter() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Playable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Playable.java index 06324a9188..ef921c89a5 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Playable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Playable.java @@ -471,4 +471,10 @@ public abstract class L2Playable extends L2Character } return null; } + + @Override + public boolean isPlayable() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 1266cccd94..836a8061f0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -858,4 +858,10 @@ public abstract class L2Summon extends L2Playable { return _owner; } + + @Override + public boolean isSummon() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ArtefactInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ArtefactInstance.java index 60f3def70d..95b5055b2c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ArtefactInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ArtefactInstance.java @@ -122,4 +122,10 @@ public final class L2ArtefactInstance extends L2NpcInstance { player.sendPacket(ActionFailed.STATIC_PACKET); } + + @Override + public boolean isArtefact() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2BoatInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2BoatInstance.java index 8cdff7b556..ed859d0f9d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2BoatInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2BoatInstance.java @@ -764,4 +764,10 @@ public class L2BoatInstance extends L2Character { return false; } + + @Override + public boolean isBoat() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 8ebc3029f7..63e158b762 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -975,4 +975,10 @@ public class L2DoorInstance extends L2Character } return true; } + + @Override + public boolean isDoor() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java index 042eee78cb..e711dbc6cd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java @@ -1558,4 +1558,10 @@ public final class L2ItemInstance extends L2Object { return (_item instanceof L2Weapon); } + + @Override + public boolean isItem() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java index 12c52de7dd..f31ac62233 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java @@ -110,4 +110,10 @@ public final class L2MinionInstance extends L2MonsterInstance _master.notifyMinionDied(this); return true; } + + @Override + public boolean isMinion() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 10a8b3ebec..5480c22ef4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -351,4 +351,10 @@ public class L2MonsterInstance extends L2Attackable } _minionList.clearRespawnList(); } + + @Override + public boolean isMonster() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index a0646a052e..6b0553f495 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -3366,4 +3366,10 @@ public class L2NpcInstance extends L2Character { _customNpcInstance = arg; } + + @Override + public boolean isNpc() + { + return true; + } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 021b2b418e..0a076a2ffc 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -1199,4 +1199,10 @@ public class L2PetInstance extends L2Summon Olympiad.getInstance().notifyCompetitorDamage(getOwner(), damage, getOwner().getOlympiadGameId()); } } + + @Override + public boolean isPet() + { + return true; + } }