diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java index fab3857fa6..f130a55bc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java @@ -48,10 +48,6 @@ class GroundItem private boolean tradeable; @Nonnull private LootType lootType; - /** - * Is dropped by me - */ - private boolean isDropped; @Nullable private Instant spawnTime; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 1e626e776a..0624652fb7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -364,7 +364,7 @@ public class GroundItemsOverlay extends Overlay private void drawTimerOverlay(Graphics2D graphics, int textX, int textY, GroundItem groundItem) { // We can only accurately guess despawn times for our own pvm loot and dropped items - if (groundItem.getLootType() != LootType.PVM && !groundItem.isDropped()) + if (groundItem.getLootType() != LootType.PVM && groundItem.getLootType() != LootType.DROPPED) { return; } @@ -395,7 +395,7 @@ public class GroundItemsOverlay extends Overlay } else { - if (groundItem.isDropped()) + if (groundItem.getLootType() == LootType.DROPPED) { despawnTime = spawnTime.plus(DESPAWN_TIME_DROP); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index 9f12804a41..f9919508a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -393,8 +393,7 @@ public class GroundItemsPlugin extends Plugin .haPrice(alchPrice) .height(tile.getItemLayer().getHeight()) .tradeable(itemComposition.isTradeable()) - .lootType(LootType.UNKNOWN) - .isDropped(dropped) + .lootType(dropped ? LootType.DROPPED : LootType.UNKNOWN) .spawnTime(Instant.now()) .build(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java index abd6c815e0..b434298faf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/LootType.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.grounditems; enum LootType { UNKNOWN, + DROPPED, PVP, PVM; }