From 356e15df23b0c4ea352282c55b4c74059ebb76e2 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 8 Feb 2019 07:16:55 +0000
Subject: [PATCH] Adjustments for L2Object missing overrides.
---
.../l2jmobius/gameserver/model/L2Object.java | 15 +++++---------
.../gameserver/model/actor/L2Character.java | 20 -------------------
.../model/actor/instance/L2PcInstance.java | 6 ++++++
.../model/waypoint/WayPointNode.java | 6 ------
4 files changed, 11 insertions(+), 36 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 4b8bfcca37..d67c07c114 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
@@ -453,18 +453,8 @@ public abstract class L2Object
}
}
- public boolean isAttackable()
- {
- return false;
- }
-
public abstract boolean isAutoAttackable(L2Character attacker);
- public boolean isMarker()
- {
- return false;
- }
-
/**
* Concept :
*
@@ -650,4 +640,9 @@ public abstract class L2Object
{
return false;
}
+
+ public boolean isAttackable()
+ {
+ 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 fda10a93c1..4c33ced322 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
@@ -2312,26 +2312,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
return _ai != null;
}
- /**
- * Return True if the L2Character is RaidBoss or his minion.
- * @return true, if is raid
- */
- @Override
- public boolean isRaid()
- {
- return false;
- }
-
- /**
- * Return True if the L2Character is an Npc.
- * @return true, if is npc
- */
- @Override
- public boolean isNpc()
- {
- return false;
- }
-
/**
* Return a list of L2Character that attacked.
* @return the attack by list
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index d5a236ecf4..9dcb5fda17 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -18312,4 +18312,10 @@ public final class L2PcInstance extends L2Playable
}
_currentPetSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed);
}
+
+ @Override
+ public boolean isPlayer()
+ {
+ return true;
+ }
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/waypoint/WayPointNode.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/waypoint/WayPointNode.java
index aa0e34ccf1..f430d058d6 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/waypoint/WayPointNode.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/waypoint/WayPointNode.java
@@ -135,12 +135,6 @@ public class WayPointNode extends L2Object
changeID(Config.SELECTED_NODE_ID, SELECTED);
}
- @Override
- public boolean isMarker()
- {
- return true;
- }
-
public final String getTitle()
{
return _title;