ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Update lootManager with upstream to fix Nightmare in loottracker. (#2872)

Browse Source 
Co-authored-by: Your Name <you@example.com>
This commit is contained in:
ReeeMan
2020-12-06 01:17:02 +00:00
committed by GitHub
parent 528d427bc5
commit 5cd865f43f
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runelite-client/src/main/java/net/runelite/client/game/LootManager.java
View File

@@ -55,6 +55,7 @@ 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;
import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerDespawned;
import net.runelite.api.events.NpcDefinitionChanged;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.NpcLootReceived; import net.runelite.client.events.NpcLootReceived;
import net.runelite.client.events.PlayerLootReceived; import net.runelite.client.events.PlayerLootReceived;
@@ -112,6 +113,7 @@ public class LootManager
eventBus.subscribe(ItemDespawned.class, this, this::onItemDespawned); eventBus.subscribe(ItemDespawned.class, this, this::onItemDespawned);
eventBus.subscribe(ItemQuantityChanged.class, this, this::onItemQuantityChanged); eventBus.subscribe(ItemQuantityChanged.class, this, this::onItemQuantityChanged);
eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged);
eventBus.subscribe(NpcDefinitionChanged.class, this, this::onNpcDefinitionChanged);
} }
private void onNpcDespawned(NpcDespawned npcDespawned) private void onNpcDespawned(NpcDespawned npcDespawned)
@@ -246,11 +248,6 @@ public class LootManager
// Big Kraken drops loot wherever player is standing when animation starts. // Big Kraken drops loot wherever player is standing when animation starts.
krakenPlayerLocation = client.getLocalPlayer().getWorldLocation(); krakenPlayerLocation = client.getLocalPlayer().getWorldLocation();
} }
else if (id == NpcID.THE_NIGHTMARE_9433)
{
delayedLootNpc = npc;
delayedLootTickLimit = 16;
}
else else
{ {
// These NPCs drop loot on death animation, which is right now. // These NPCs drop loot on death animation, which is right now.
@@ -259,6 +256,16 @@ public class LootManager
} }
} }
public void onNpcDefinitionChanged(NpcDefinitionChanged npcChanged)
{
final NPC npc = npcChanged.getNpc();
if (npc.getId() == NpcID.THE_NIGHTMARE_9433)
{
delayedLootNpc = npc;
delayedLootTickLimit = 15;
}
}
private void onGameTick(GameTick gameTick) private void onGameTick(GameTick gameTick)
{ {
if (delayedLootNpc != null && delayedLootTickLimit-- > 0) if (delayedLootNpc != null && delayedLootTickLimit-- > 0)
@@ -439,4 +446,4 @@ public class LootManager
final List<ItemStack> itemStacks = itemSpawns.get(packed); final List<ItemStack> itemStacks = itemSpawns.get(packed);
return Collections.unmodifiableList(itemStacks); return Collections.unmodifiableList(itemStacks);
} }
} }