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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2022-06-21 23:20:01 +02:00
parent bf554db646 8972a6de25
commit 0a81939200
3 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/game/NpcUtil.java
View File

@@ -26,19 +26,22 @@
package net.runelite.client.game;
import java.util.Set;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.runelite.api.NPC;
import net.runelite.api.NPCComposition;
import net.runelite.api.NpcID;
import net.runelite.client.RuntimeConfig;
import org.apache.commons.lang3.ArrayUtils;
@Singleton
public class NpcUtil
{
private final RuntimeConfig runtimeConfig;
@Inject
private NpcUtil(RuntimeConfig runtimeConfig)
private NpcUtil(@Nullable RuntimeConfig runtimeConfig)
{
this.runtimeConfig = runtimeConfig;
}
@@ -92,10 +95,13 @@ public class NpcUtil
case NpcID.KALPHITE_QUEEN_963: // KQ's first form sometimes regenerates 1hp after reaching 0hp, thus not dying
return false;
default:
Set<Integer> ignoredNpcs = runtimeConfig.getIgnoreDeadNpcs();
if (ignoredNpcs != null && ignoredNpcs.contains(id))
if (runtimeConfig != null)
{
return false;
Set<Integer> ignoredNpcs = runtimeConfig.getIgnoreDeadNpcs();
if (ignoredNpcs != null && ignoredNpcs.contains(id))
{
return false;
}
}
final NPCComposition npcComposition = npc.getTransformedComposition();

2
runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
View File

@@ -223,7 +223,7 @@ public class XpDropPlugin extends Plugin
{
for (XpPrayer prayer : XpPrayer.values())
{
if (client.isPrayerActive(prayer.getPrayer()))
if (client.getServerVarbitValue(prayer.getPrayer().getVarbit()) == 1)
{
return prayer.getType();
}