Browse Source

BETA: Minor typo fixes in [5693].

Reported by: jurchiks
Zoey76 12 years ago
parent
commit
b5e8f0fc24

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java

@@ -91,9 +91,9 @@ public class L2NpcBufferInstance extends L2Npc
 		L2Character target = player;
 		if (command.startsWith("Pet"))
 		{
-			if (player.hasSummon())
+			if (!player.hasSummon())
 			{
-				player.sendMessage("You do not have your pet summoned.");
+				player.sendPacket(SystemMessageId.DONT_HAVE_PET);
 				showChatWindow(player, 0); // 0 = main window
 				return;
 			}

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

@@ -14,7 +14,7 @@
  */
 package com.l2jserver.gameserver.model.conditions;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import com.l2jserver.gameserver.model.stats.Env;
 
@@ -23,13 +23,13 @@ import com.l2jserver.gameserver.model.stats.Env;
  */
 public class ConditionPlayerServitorNpcId extends Condition
 {
-	private final ArrayList<Integer> _npcIds;
+	private final List<Integer> _npcIds;
 	
 	/**
 	 * Instantiates a new condition player servitor npc id.
 	 * @param npcIds the npc ids
 	 */
-	public ConditionPlayerServitorNpcId(ArrayList<Integer> npcIds)
+	public ConditionPlayerServitorNpcId(List<Integer> npcIds)
 	{
 		if ((npcIds.size() == 1) && (npcIds.get(0) == 0))
 		{
@@ -44,7 +44,7 @@ public class ConditionPlayerServitorNpcId extends Condition
 	@Override
 	public boolean testImpl(Env env)
 	{
-		if ((env.getPlayer() == null) || env.getPlayer().hasSummon())
+		if ((env.getPlayer() == null) || !env.getPlayer().hasSummon())
 		{
 			return false;
 		}