Log when restoring unavailable item template.
This commit is contained in:
@@ -1918,27 +1918,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1935,27 +1935,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1935,27 +1935,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1935,27 +1935,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1912,27 +1912,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2034,27 +2034,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2034,27 +2034,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2015,27 +2015,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1935,27 +1935,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1935,27 +1935,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1912,27 +1912,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2034,27 +2034,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2034,27 +2034,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2015,27 +2015,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1935,27 +1935,34 @@ public abstract class Inventory extends ItemContainer
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
final ItemInstance item = new ItemInstance(rs);
|
try
|
||||||
if (getOwner().isPlayer())
|
|
||||||
{
|
{
|
||||||
final PlayerInstance player = (PlayerInstance) getOwner();
|
final ItemInstance item = new ItemInstance(rs);
|
||||||
|
if (getOwner().isPlayer())
|
||||||
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem())
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
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);
|
LOGGER.warning("Could not restore item " + rs.getInt("item_id") + " for " + getOwner());
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
addItem(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user