Bladeren bron

BETA: Core-Part for [DP10173].

Nos 11 jaren geleden
bovenliggende
commit
e9df6865cb

+ 1 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcData.java

@@ -350,6 +350,7 @@ public class NpcData extends DocumentParser
 									set.set("clanHelpRange", parseInteger(attrs, "clanHelpRange"));
 									set.set("dodge", parseInteger(attrs, "dodge"));
 									set.set("isChaos", parseBoolean(attrs, "isChaos"));
+									set.set("isAggressive", parseBoolean(attrs, "isAggressive"));
 									for (Node ai_node = npc_node.getFirstChild(); ai_node != null; ai_node = ai_node.getNextSibling())
 									{
 										attrs = ai_node.getAttributes();

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java

@@ -93,7 +93,7 @@ public class L2MonsterInstance extends L2Attackable
 	@Override
 	public boolean isAggressive()
 	{
-		return (getAggroRange() > 0) && !isEventMob();
+		return getTemplate().isAggressive() && !isEventMob();
 	}
 	
 	@Override

+ 7 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

@@ -91,6 +91,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 	private int _clanHelpRange;
 	private int _dodge;
 	private boolean _isChaos;
+	private boolean _isAggressive;
 	private int _soulShot;
 	private int _spiritShot;
 	private int _soulShotChance;
@@ -166,6 +167,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 		_clanHelpRange = set.getInt("clanHelpRange", 0);
 		_dodge = set.getInt("dodge", 0);
 		_isChaos = set.getBoolean("isChaos", false);
+		_isAggressive = set.getBoolean("isAggressive", true);
 		
 		_soulShot = set.getInt("soulShot", 0);
 		_spiritShot = set.getInt("spiritShot", 0);
@@ -375,6 +377,11 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 		return _isChaos;
 	}
 	
+	public boolean isAggressive()
+	{
+		return _isAggressive;
+	}
+	
 	public int getSoulShot()
 	{
 		return _soulShot;