Fixed augmentation skills were not removed from accessories.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-11-12 10:53:02 +00:00
parent 359a418836
commit 0c46db8126
18 changed files with 108 additions and 36 deletions

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -132,9 +132,14 @@ public class RequestRefineCancel extends GameClientPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -144,7 +149,6 @@ public class RequestRefineCancel extends GameClientPacket
player.sendPacket(new ExVariationCancelResult(1));
// send inventory update
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendPacket(iu);

View File

@ -145,9 +145,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -157,7 +162,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
player.sendPacket(new ExVariationCancelResult(1));
// send inventory update
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendPacket(iu);
}

View File

@ -145,9 +145,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -157,7 +162,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
player.sendPacket(new ExVariationCancelResult(1));
// send inventory update
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendPacket(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}

View File

@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
// unequip item
final InventoryUpdate iu = new InventoryUpdate();
if (targetItem.isEquipped())
{
player.disarmWeapons();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
for (ItemInstance itm : unequiped)
{
iu.addModifiedItem(itm);
}
}
// remove the augmentation
@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendInventoryUpdate(iu);
}