Centralize item (de)spawn log messages

Fixes runelite/runelite#5452
This commit is contained in:
Jordan Atwood
2018-09-14 12:07:40 -07:00
parent db70df613e
commit ea284f9ca0
2 changed files with 10 additions and 6 deletions

View File

@@ -50,6 +50,7 @@ import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.ItemDespawned;
import net.runelite.api.events.ItemQuantityChanged; import net.runelite.api.events.ItemQuantityChanged;
import net.runelite.api.events.ItemSpawned; import net.runelite.api.events.ItemSpawned;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
@@ -160,7 +161,15 @@ public class LootManager
final LocalPoint location = tile.getLocalLocation(); final LocalPoint location = tile.getLocalLocation();
final int packed = location.getSceneX() << 8 | location.getSceneY(); final int packed = location.getSceneX() << 8 | location.getSceneY();
itemSpawns.put(packed, new ItemStack(item.getId(), item.getQuantity())); itemSpawns.put(packed, new ItemStack(item.getId(), item.getQuantity()));
log.debug("Item spawn {} location {},{}", item.getId(), location); log.debug("Item spawn {} ({}) location {},{}", item.getId(), item.getQuantity(), location);
}
@Subscribe
public void onItemDespawned(ItemDespawned itemDespawned)
{
final Item item = itemDespawned.getItem();
final LocalPoint location = itemDespawned.getTile().getLocalLocation();
log.debug("Item despawn {} ({}) location {},{}", item.getId(), item.getQuantity(), location);
} }
@Subscribe @Subscribe

View File

@@ -295,7 +295,6 @@ public abstract class RSTileMixin implements RSTile
for (RSNode cur = head.getNext(); cur != head; cur = cur.getNext()) for (RSNode cur = head.getNext(); cur != head; cur = cur.getNext())
{ {
RSItem item = (RSItem) cur; RSItem item = (RSItem) cur;
client.getLogger().debug("Item despawn (chunk reset): {} ({})", item.getId(), item.getQuantity());
ItemDespawned itemDespawned = new ItemDespawned(this, item); ItemDespawned itemDespawned = new ItemDespawned(this, item);
client.getCallbacks().post(itemDespawned); client.getCallbacks().post(itemDespawned);
} }
@@ -314,7 +313,6 @@ public abstract class RSTileMixin implements RSTile
{ {
if (lastUnlink != null) if (lastUnlink != null)
{ {
client.getLogger().debug("Item despawn: {} ({})", lastUnlink.getId(), lastUnlink.getQuantity());
ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink);
client.getCallbacks().post(itemDespawned); client.getCallbacks().post(itemDespawned);
} }
@@ -327,7 +325,6 @@ public abstract class RSTileMixin implements RSTile
{ {
if (lastUnlink != null) if (lastUnlink != null)
{ {
client.getLogger().debug("Item despawn: {} ({})", lastUnlink.getId(), lastUnlink.getQuantity());
ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink);
client.getCallbacks().post(itemDespawned); client.getCallbacks().post(itemDespawned);
} }
@@ -361,7 +358,6 @@ public abstract class RSTileMixin implements RSTile
if (lastUnlink != null && lastUnlink != previous && lastUnlink != next) if (lastUnlink != null && lastUnlink != previous && lastUnlink != next)
{ {
client.getLogger().debug("Item despawn: {} ({})", lastUnlink.getId(), lastUnlink.getQuantity());
ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink);
client.getCallbacks().post(itemDespawned); client.getCallbacks().post(itemDespawned);
} }
@@ -374,7 +370,6 @@ public abstract class RSTileMixin implements RSTile
do do
{ {
RSItem item = (RSItem) current; RSItem item = (RSItem) current;
client.getLogger().debug("Item spawn: {} ({})", item.getId(), item.getQuantity());
item.setX(x); item.setX(x);
item.setY(y); item.setY(y);