From fbf1f53892110670db8b0bea643513bca7a8ce07 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:01:07 +0200 Subject: [PATCH] itemcharges: Merge nested if statements --- .../plugins/itemcharges/ItemChargePlugin.java | 9 +++------ .../plugins/itemcharges/ItemRecoilOverlay.java | 18 ++++++++---------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 648b517d74..0cf44d6f25 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -567,13 +567,10 @@ public class ItemChargePlugin extends Plugin @Subscribe public void onSpotAnimationChanged(SpotAnimationChanged event) { - if (event.getActor() == client.getLocalPlayer()) + if (event.getActor() == client.getLocalPlayer() && client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) { - if (client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) - { - final int xericCharges = Math.max(this.xericTalisman - 1, 0); - updateXericCharges(xericCharges); - } + final int xericCharges = Math.max(this.xericTalisman - 1, 0); + updateXericCharges(xericCharges); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java index 57e00c2f64..bc37d03b27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java @@ -60,19 +60,17 @@ class ItemRecoilOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); this.imagePanelComponent.getChildren().clear(); - if (plugin.isShowrecoil()) + if (plugin.isShowrecoil() && plugin.isRingOfRecoilAvailable()) { - if (plugin.isRingOfRecoilAvailable()) - { - BufferedImage recoilImage = plugin.getRecoilRingImage(); - imagePanelComponent.setBackgroundColor(plugin - .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); - imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); + BufferedImage recoilImage = plugin.getRecoilRingImage(); + imagePanelComponent.setBackgroundColor(plugin + .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); + imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); - imagePanelComponent.getChildren().add(tableComponent); - return imagePanelComponent.render(graphics); - } + imagePanelComponent.getChildren().add(tableComponent); + return imagePanelComponent.render(graphics); } + return null; } } \ No newline at end of file