Răsfoiți Sursa

BETA: Using accessors for eventMob field.

Zoey76 12 ani în urmă
părinte
comite
86510d4a7f

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java

@@ -105,7 +105,7 @@ public abstract class AbstractPlayerGroup
 	
 	/**
 	 * Broadcasts a System Message to this group
-	 * @param message System Message to bradcast
+	 * @param message System Message to broadcast
 	 */
 	public void broadcastMessage(SystemMessageId message)
 	{

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

@@ -506,7 +506,7 @@ public class L2Attackable extends L2Npc
 			}
 		}
 		
-		if (isEventMob)
+		if (isEventMob())
 		{
 			return;
 		}

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

@@ -5546,7 +5546,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a L2PcInstance)
-		if ((target == null) || isAlikeDead() || (isNpc() && ((L2Npc) this).isEventMob))
+		if ((target == null) || isAlikeDead() || (isNpc() && ((L2Npc) this).isEventMob()))
 		{
 			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
 			return;

+ 12 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -119,7 +119,7 @@ public class L2Npc extends L2Character
 	/** The fortress index in the array of L2Fort this L2NpcInstance belongs to */
 	private int _fortIndex = -2;
 	
-	public boolean isEventMob = false;
+	private boolean _eventMob = false;
 	private boolean _isInTown = false;
 	
 	/** True if this L2Npc is autoattackable **/
@@ -146,9 +146,7 @@ public class L2Npc extends L2Character
 	private int _displayEffect = 0;
 	private int _scriptVal = 0;
 	
-	/**
-	 * The character that summons this NPC.
-	 */
+	/** The character that summons this NPC. */
 	private L2Character _summoner = null;
 	
 	private final L2NpcAIData _staticAIData = getTemplate().getAIDataStatic();
@@ -688,6 +686,16 @@ public class L2Npc extends L2Character
 		return 2 * getDistanceToWatchObject(object);
 	}
 	
+	public boolean isEventMob()
+	{
+		return _eventMob;
+	}
+	
+	public void setEventMob(boolean val)
+	{
+		_eventMob = val;
+	}
+	
 	@Override
 	public boolean isAutoAttackable(L2Character attacker)
 	{

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

@@ -83,16 +83,16 @@ public class L2MonsterInstance extends L2Attackable
 	@Override
 	public boolean isAutoAttackable(L2Character attacker)
 	{
-		return super.isAutoAttackable(attacker) && !isEventMob;
+		return super.isAutoAttackable(attacker) && !isEventMob();
 	}
 	
 	/**
-	 * Return True if the L2MonsterInstance is Agressive (aggroRange > 0).
+	 * Return True if the L2MonsterInstance is Aggressive (aggroRange > 0).
 	 */
 	@Override
 	public boolean isAggressive()
 	{
-		return (getAggroRange() > 0) && !isEventMob;
+		return (getAggroRange() > 0) && !isEventMob();
 	}
 	
 	@Override

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/L2Event.java

@@ -186,7 +186,7 @@ public class L2Event
 			spawn.init();
 			spawn.getLastSpawn().setCurrentHp(999999999);
 			spawn.getLastSpawn().setTitle(_eventName);
-			spawn.getLastSpawn().isEventMob = true;
+			spawn.getLastSpawn().setEventMob(true);
 			// spawn.getLastSpawn().decayMe();
 			// spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ());
 			
@@ -207,7 +207,7 @@ public class L2Event
 		// Its a little rough, but for sure it will remove every damn event NPC.
 		for (L2Spawn spawn : SpawnTable.getInstance().getSpawnTable())
 		{
-			if ((spawn.getLastSpawn() != null) && spawn.getLastSpawn().isEventMob)
+			if ((spawn.getLastSpawn() != null) && spawn.getLastSpawn().isEventMob())
 			{
 				spawn.getLastSpawn().deleteMe();
 				spawn.stopRespawn();