From 83fd69c48ec26cece0295379843915790873da63 Mon Sep 17 00:00:00 2001 From: Ganom Date: Thu, 30 May 2019 17:13:46 -0400 Subject: [PATCH] Various Fixes (#450) --- .../client/plugins/experiencedrop/XpDropConfig.java | 4 ++-- .../client/plugins/experiencedrop/XpDropPlugin.java | 8 ++++---- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java index e415f3e61f..701405001d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropConfig.java @@ -95,12 +95,12 @@ public interface XpDropConfig extends Config } @ConfigItem( - keyName = "showDamage", + keyName = "showdamagedrops", name = "Show Damage on XP Drop", description = "Show what you hit next to the XP drop", position = 5 ) - default DamageMode showdamage() + default DamageMode showdamagedrops() { return DamageMode.NONE; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index d99e54ef59..3f8fd4f9fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -113,7 +113,7 @@ public class XpDropPlugin extends Plugin @Override protected void startUp() throws Exception { - damageMode = config.showdamage(); + damageMode = config.showdamagedrops(); if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT) { @@ -138,7 +138,7 @@ public class XpDropPlugin extends Plugin if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT) { - damageMode = config.showdamage(); + damageMode = config.showdamagedrops(); if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT) { @@ -147,7 +147,7 @@ public class XpDropPlugin extends Plugin } else { - damageMode = config.showdamage(); + damageMode = config.showdamagedrops(); if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT) { @@ -343,7 +343,7 @@ public class XpDropPlugin extends Plugin @Subscribe public void onScriptCallbackEvent(ScriptCallbackEvent e) { - if (config.showdamage() == XpDropConfig.DamageMode.NONE) + if (config.showdamagedrops() == XpDropConfig.DamageMode.NONE) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index ce8f02472d..8a3c0570f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -1197,7 +1197,7 @@ public class MenuEntrySwapperPlugin extends Plugin swap(client, "teleport menu", option, target, true); } - if (config.getTempConstruction() && buildingMode) + if (config.getTempConstruction() && buildingMode && !Strings.isNullOrEmpty(config.getTempConstructionItems())) { if (event.getType() == WALK.getId()) {