2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-02 16:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #252 from CharlesVaneenoo/RefactorHandle

Browse Source 
refactor method handle in EquipItemHandler.java
This commit is contained in:
Major
2016-03-13 09:28:05 +00:00
parent d533051acb 172e347912
commit a59bbe68f6
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/org/apollo/game/message/handler/EquipItemHandler.java
+36 -20
View File
@@ -64,26 +64,7 @@ public final class EquipItemHandler extends MessageHandler<ItemOptionMessage> {
Item shield = equipment.get(SHIELD);
if (definition.isTwoHanded()) {
int slotsRequired = weapon != null && shield != null ? 1 : 0;
if (inventory.freeSlots() < slotsRequired) {
player.sendMessage("You don't have enough free inventory space to do that.");
message.terminate();
return;
}
equipment.reset(SHIELD);
equipment.set(WEAPON, inventory.reset(inventorySlot));
if (shield != null) {
inventory.add(shield);
}
if (weapon != null) {
inventory.add(weapon);
}
player.stopAction();
handleTwoHanded(inventory, equipment, inventorySlot, weapon, shield, player, message);
return;
}
@@ -117,6 +98,41 @@ public final class EquipItemHandler extends MessageHandler<ItemOptionMessage> {
}
}
/**
* Attempts to equip the two-handed item requested by the {@link Player}.
*
* @param inventory The {@link Inventory} of the {@link Player}.
* @param equipment The equipment of the {@link Player}.
* @param inventorySlot The slot of the 2-handed item in the {@link Inventory}.
* @param weapon The weapon the {@link Player} currently has equipped.
* @param shield The shield the {@link Player} currently has equipped.
* @param player The {@link Player} equipping the item.
* @param message The {@link ItemOptionMessage} sent by the client.
*/
private void handleTwoHanded(Inventory inventory, Inventory equipment, int inventorySlot, Item weapon, Item shield, Player player, ItemOptionMessage message) {
int slotsRequired = weapon != null && shield != null ? 1 : 0;
if (inventory.freeSlots() < slotsRequired) {
player.sendMessage("You don't have enough free inventory space to do that.");
message.terminate();
return;
}
equipment.reset(SHIELD);
equipment.set(WEAPON, inventory.reset(inventorySlot));
if (shield != null) {
inventory.add(shield);
}
if (weapon != null) {
inventory.add(weapon);
}
player.stopAction();
}
/**
* Returns whether or not the specified {@link Player} has the required levels to equip the item with the specified
* {@link EquipmentDefinition}, sending the {@link Player} a message if not.