From d184a908f785bc18891750cd3d3dd3d3f8d30e73 Mon Sep 17 00:00:00 2001 From: Levi Schuck Date: Sun, 8 Apr 2018 15:05:45 -0500 Subject: [PATCH] Lumbridge npcs have some bad compositions and return null in the dev tools. --- .../plugins/devtools/DevToolsOverlay.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index 799ff0b35e..e21485d937 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -154,21 +154,27 @@ public class DevToolsOverlay extends Overlay for (NPC npc : npcs) { NPCComposition composition = npc.getComposition(); + Color color = composition.getCombatLevel() > 1 ? YELLOW : ORANGE; if (composition.getConfigs() != null) { - composition = composition.transform(); + NPCComposition transformedComposition = composition.transform(); + if (transformedComposition == null) + { + color = GRAY; + } + else + { + composition = transformedComposition; + } } - String text = composition.getName() + " (ID: " + composition.getId() + ") (A: " + npc.getAnimation() - + ") (G: " + npc.getGraphic() + ")"; - if (npc.getCombatLevel() > 1) - { - OverlayUtil.renderActorOverlay(graphics, npc, text, YELLOW); - } - else - { - OverlayUtil.renderActorOverlay(graphics, npc, text, ORANGE); - } + String text = String.format("%s (ID: %d) (A: %d) (G: %d)", + composition.getName(), + composition.getId(), + npc.getAnimation(), + npc.getGraphic()); + + OverlayUtil.renderActorOverlay(graphics, npc, text, color); } }