Log when restoring unavailable item template.

This commit is contained in:
MobiusDevelopment
2019-10-18 09:06:47 +00:00
parent 6b9722a096
commit 12710f8bd2
15 changed files with 345 additions and 240 deletions

View File

@ -1912,27 +1912,34 @@ public abstract class Inventory extends ItemContainer
{
while (rs.next())
{
final ItemInstance item = new ItemInstance(rs);
if (getOwner().isPlayer())
try
{
final PlayerInstance player = (PlayerInstance) getOwner();
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
final ItemInstance item = new ItemInstance(rs);
if (getOwner().isPlayer())
{
item.setItemLocation(ItemLocation.INVENTORY);
final PlayerInstance player = (PlayerInstance) getOwner();
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
{
item.setItemLocation(ItemLocation.INVENTORY);
}
}
World.getInstance().addObject(item);
// If stackable item is found in inventory just add to current quantity
if (item.isStackable() && (getItemByItemId(item.getId()) != null))
{
addItem("Restore", item, getOwner().getActingPlayer(), null);
}
else
{
addItem(item);
}
}
World.getInstance().addObject(item);
// If stackable item is found in inventory just add to current quantity
if (item.isStackable() && (getItemByItemId(item.getId()) != null))
catch (Exception e)
{
addItem("Restore", item, getOwner().getActingPlayer(), null);
}
else
{
addItem(item);
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
}
}
}