Changeset 5161

Timestamp:

Jan 30, 2012 9:12:19 AM (4 months ago)

Author:

Zoey76

Message:

BETA: Fix for disarm weapon logic:

• If there is no weapon to disarm should return true. Typo from [5049].
• Fixes check with mounts.
• Fixes check with Rent Pets.
• Added some comments and fixed some JavaDocs?.

Thanks burrito.

File:

• branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (modified) (2 diffs)

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -6605 +6605 @@
         /**
          * Disarm the player's weapon.
-         * @return true if the player was disarmed, false otherwise.
+         * @return {@code true} if the player was disarmed or doesn't have a weapon to disarm, {@code false} otherwise.
          */
         public boolean disarmWeapons()
         {
+                // If there is no weapon to disarm then return true.
+                final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+                if (wpn == null)
+                {
+                        return true;
+                }
+                
                 // Don't allow disarming a cursed weapon
-                if (isCursedWeaponEquipped()) 
+                if (isCursedWeaponEquipped())
+                {
                         return false;
-                
-                // Don't allow disarming a Combat Flag or Territory Ward
-                else if (isCombatFlagEquipped()) 
+                }
+                
+                // Don't allow disarming a Combat Flag or Territory Ward.
+                if (isCombatFlagEquipped())
+                {
                         return false;
-                
-                // Unequip the weapon
-                L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
-                if (wpn == null)
+                }
+                
+                // Don't allow disarming if the weapon is force equip.
+                if (wpn.getWeaponItem().isForceEquip())
                 {
                         return false;
                 }
-                else if (wpn.getWeaponItem().isForceEquip())
-                {
-                        return false;
-                }
-                else
-                {
-                        L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
-                        InventoryUpdate iu = new InventoryUpdate();
-                        for (L2ItemInstance itm: unequiped)
-                                iu.addModifiedItem(itm);
-                        sendPacket(iu);
-                        
-                        abortAttack();
-                        broadcastUserInfo();
-                        
-                        // this can be 0 if the user pressed the right mousebutton twice very fast
-                        if (unequiped.length > 0)
-                        {
-                                SystemMessage sm = null;
-                                if (unequiped[0].getEnchantLevel() > 0)
-                                {
-                                        sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-                                        sm.addNumber(unequiped[0].getEnchantLevel());
-                                        sm.addItemName(unequiped[0]);
-                                }
-                                else
-                                {
-                                        sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
-                                        sm.addItemName(unequiped[0]);
-                                }
-                                sendPacket(sm);
-                        }
+                
+                final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
+                final InventoryUpdate iu = new InventoryUpdate();
+                for (L2ItemInstance itm: unequiped)
+                {
+                        iu.addModifiedItem(itm);
+                }
+                
+                sendPacket(iu);
+                abortAttack();
+                broadcastUserInfo();
+                
+                // This can be 0 if the user pressed the right mousebutton twice very fast.
+                if (unequiped.length > 0)
+                {
+                        final SystemMessage sm;
+                        if (unequiped[0].getEnchantLevel() > 0)
+                        {
+                                sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+                                sm.addNumber(unequiped[0].getEnchantLevel());
+                                sm.addItemName(unequiped[0]);
+                        }
+                        else
+                        {
+                                sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+                                sm.addItemName(unequiped[0]);
+                        }
+                        sendPacket(sm);
                 }
                 return true;
@@ -6660 +6666 @@
         
         /**
-         * Disarm the player's shield.<BR><BR>
-         * @return 
+         * Disarm the player's shield.
+         * @return {@code true}.
          */
         public boolean disarmShield()