Prechádzať zdrojové kódy

BETA: Misc fixes:
* L2Npc JavaDoc fixes and using direct access to QuestEventType.
* ConditionPlayerTransformationId JavaDoc fixes and minor refactor.

Zoey76 13 rokov pred
rodič
commit
f7aa34b40b

+ 10 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -63,6 +63,7 @@ import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.type.L2TownZone;
@@ -80,10 +81,11 @@ import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;
 
 /**
- * This class represents a Non-Player-Character in the world. It can be a monster or a friendly character.
- * It also uses a template to fetch some static values. The templates are hardcoded in the client, so we can rely on them.<BR><BR>
- *
- * L2Character :<BR><BR>
+ * This class represents a Non-Player-Character in the world.<br>
+ * It can be a monster or a friendly character.<br>
+ * It also uses a template to fetch some static values.<br>
+ * The templates are hardcoded in the client, so we can rely on them.
+ * L2Npc:<br>
  * <li>L2Attackable</li>
  * <li>L2BoxInstance</li>
  */
@@ -1390,8 +1392,8 @@ public class L2Npc extends L2Character
 	{
 		super.onSpawn();
 		
-		if (getTemplate().getEventQuests(Quest.QuestEventType.ON_SPAWN) != null)
-			for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_SPAWN))
+		if (getTemplate().getEventQuests(QuestEventType.ON_SPAWN) != null)
+			for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_SPAWN))
 				quest.notifySpawn(this);
 	}
 	
@@ -1637,12 +1639,12 @@ public class L2Npc extends L2Character
 	{
 		try
 		{
-			if (getTemplate().getEventQuests(Quest.QuestEventType.ON_SPELL_FINISHED) != null)
+			if (getTemplate().getEventQuests(QuestEventType.ON_SPELL_FINISHED) != null)
 			{
 				L2PcInstance player = null;
 				if (target != null)
 					player = target.getActingPlayer();
-				for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_SPELL_FINISHED))
+				for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_SPELL_FINISHED))
 				{
 					quest.notifySpellFinished(this, player, skill);
 				}

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTransformationId.java

@@ -18,9 +18,8 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.stats.Env;
 
 /**
- * This condition becomes true whether the player is transformed<br>
- * and the transformation Id match the parameter or the parameter is -1<br>
- * which returns true if player is transformed regardless the transformation Id.
+ * This condition becomes true whether the player is transformed and the transformation Id match the parameter or<br>
+ * the parameter is -1 which returns true if player is transformed regardless the transformation Id.
  * @author Zoey76
  */
 public class ConditionPlayerTransformationId extends Condition
@@ -39,11 +38,11 @@ public class ConditionPlayerTransformationId extends Condition
 	@Override
 	public boolean testImpl(Env env)
 	{
-		if (env.getPlayer() == null)
+		final L2PcInstance player = env.getPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final L2PcInstance player = env.getPlayer();
 		if (_id == -1)
 		{
 			return player.isTransformed();