From ea284f9ca0a59706721e81599ad36027f25312bd Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 14 Sep 2018 12:07:40 -0700 Subject: [PATCH] Centralize item (de)spawn log messages Fixes runelite/runelite#5452 --- .../java/net/runelite/client/game/LootManager.java | 11 ++++++++++- .../main/java/net/runelite/mixins/RSTileMixin.java | 5 ----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java index ba7964fff1..371fa8744f 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java @@ -50,6 +50,7 @@ import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.ItemDespawned; import net.runelite.api.events.ItemQuantityChanged; import net.runelite.api.events.ItemSpawned; import net.runelite.api.events.NpcDespawned; @@ -160,7 +161,15 @@ public class LootManager final LocalPoint location = tile.getLocalLocation(); final int packed = location.getSceneX() << 8 | location.getSceneY(); 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 diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java index 9f5f00f301..402de9a79c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java @@ -295,7 +295,6 @@ public abstract class RSTileMixin implements RSTile for (RSNode cur = head.getNext(); cur != head; cur = cur.getNext()) { RSItem item = (RSItem) cur; - client.getLogger().debug("Item despawn (chunk reset): {} ({})", item.getId(), item.getQuantity()); ItemDespawned itemDespawned = new ItemDespawned(this, item); client.getCallbacks().post(itemDespawned); } @@ -314,7 +313,6 @@ public abstract class RSTileMixin implements RSTile { if (lastUnlink != null) { - client.getLogger().debug("Item despawn: {} ({})", lastUnlink.getId(), lastUnlink.getQuantity()); ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); client.getCallbacks().post(itemDespawned); } @@ -327,7 +325,6 @@ public abstract class RSTileMixin implements RSTile { if (lastUnlink != null) { - client.getLogger().debug("Item despawn: {} ({})", lastUnlink.getId(), lastUnlink.getQuantity()); ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); client.getCallbacks().post(itemDespawned); } @@ -361,7 +358,6 @@ public abstract class RSTileMixin implements RSTile if (lastUnlink != null && lastUnlink != previous && lastUnlink != next) { - client.getLogger().debug("Item despawn: {} ({})", lastUnlink.getId(), lastUnlink.getQuantity()); ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); client.getCallbacks().post(itemDespawned); } @@ -374,7 +370,6 @@ public abstract class RSTileMixin implements RSTile do { RSItem item = (RSItem) current; - client.getLogger().debug("Item spawn: {} ({})", item.getId(), item.getQuantity()); item.setX(x); item.setY(y);