Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/PetFood.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/itemhandlers/PetFood.java (modified) (4 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/PetFood.java

@@ -19 +19 @@
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
@@ -34 +34 @@
 public class PetFood implements IItemHandler
 {
+        @Override
         public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
         {
@@ -86 +87 @@
                                         if (((L2PetInstance) activeChar).getCurrentFed() < (((L2PetInstance) activeChar).getPetData().getHungry_limit() / 100f * ((L2PetInstance) activeChar).getPetLevelData().getPetMaxFeed()))
                                         {
-                                                ((L2PetInstance) activeChar).getOwner().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_ATE_A_LITTLE_BUT_IS_STILL_HUNGRY));
+                                                activeChar.sendPacket(SystemMessageId.YOUR_PET_ATE_A_LITTLE_BUT_IS_STILL_HUNGRY);
                                         }
                                         return true;
@@ -107 +108 @@
                                                 return true;
                                         }
-                                        else
-                                        {
-                                                SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
-                                                sm.addItemName(item);
-                                                activeChar.sendPacket(sm);
-                                                return false;
-                                        }
-                                }
-                                else
-                                {
                                         SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
                                         sm.addItemName(item);
                                         activeChar.sendPacket(sm);
+                                        return false;
                                 }
+                                SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+                                sm.addItemName(item);
+                                activeChar.sendPacket(sm);
                                 return false;
                         }