From a8f6a7dcd7e73e06e977346224b4b8853a8d1742 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 8 Mar 2018 08:53:26 -0500 Subject: [PATCH] npc mixin: add null checks for composition --- .../src/main/java/net/runelite/mixins/RSNPCMixin.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java index d939576e33..0b08a1cc7d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java @@ -27,6 +27,7 @@ package net.runelite.mixins; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.rs.api.RSNPC; +import net.runelite.rs.api.RSNPCComposition; @Mixin(RSNPC.class) public abstract class RSNPCMixin implements RSNPC @@ -35,20 +36,23 @@ public abstract class RSNPCMixin implements RSNPC @Override public int getId() { - return getComposition().getId(); + RSNPCComposition composition = getComposition(); + return composition == null ? -1 : composition.getId(); } @Inject @Override public String getName() { - return getComposition().getName().replace('\u00A0', ' '); + RSNPCComposition composition = getComposition(); + return composition == null ? null : composition.getName().replace('\u00A0', ' '); } @Inject @Override public int getCombatLevel() { - return getComposition().getCombatLevel(); + RSNPCComposition composition = getComposition(); + return composition == null ? -1 : composition.getCombatLevel(); } }