Potion charges accounted for in price
This commit is contained in:
@@ -1388,12 +1388,17 @@ public class CharacterItemManager {
|
||||
|
||||
// attempt to transfer item in db
|
||||
|
||||
boolean sdrMerchant = false;
|
||||
boolean eatItem = false;
|
||||
|
||||
// SDR vendors and potions are not resold
|
||||
|
||||
if (npc.getContractID() >= 1900 && npc.getContractID() <= 1906)
|
||||
sdrMerchant = true;
|
||||
eatItem = true;
|
||||
|
||||
if (sdrMerchant) {
|
||||
if (itemToSell.template.item_type.equals(ItemType.POTION))
|
||||
eatItem = true;
|
||||
|
||||
if (eatItem) {
|
||||
this.delete(itemToSell);
|
||||
this.updateInventory();
|
||||
|
||||
@@ -1402,13 +1407,13 @@ public class CharacterItemManager {
|
||||
|
||||
// skip this check if this is a mobLoot item (which is not in any inventory)
|
||||
|
||||
if (!sdrMerchant)
|
||||
if (!eatItem)
|
||||
if (!removeItemFromInventory(itemToSell))
|
||||
return false;
|
||||
|
||||
// add item to vendor
|
||||
|
||||
if (!sdrMerchant)
|
||||
if (!eatItem)
|
||||
if (!itemMan.addItemToInventory(itemToSell))
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user