Merge pull request #10530 from Alexsuperfly/grounditems-my-dropped-loot

grounditems: show your dropped items with onlyShowLoot active
This commit is contained in:
Adam
2020-01-13 20:00:56 -05:00
committed by GitHub
4 changed files with 4 additions and 8 deletions

View File

@@ -48,10 +48,6 @@ class GroundItem
private boolean tradeable;
@Nonnull
private LootType lootType;
/**
* Is dropped by me
*/
private boolean isDropped;
@Nullable
private Instant spawnTime;

View File

@@ -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);
}

View File

@@ -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();

View File

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.grounditems;
enum LootType
{
UNKNOWN,
DROPPED,
PVP,
PVM;
}