Various Fixes (runelite#450)

ILLuMiNaTe7 · May 30, 2019 · 83fd69c · 83fd69c
1 parent c047edb
commit 83fd69c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -95,12 +95,12 @@ default int fakeXpDropDelay()
 	}
 
 	@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
@@ -113,7 +113,7 @@ XpDropConfig provideConfig(ConfigManager configManager)
 	@Override
 	protected void startUp() throws Exception
 	{
-		damageMode = config.showdamage();
+		damageMode = config.showdamagedrops();
 
 		if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
 		{
@@ -138,7 +138,7 @@ public void onConfigChanged(ConfigChanged event)
 
 		if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
 		{
-			damageMode = config.showdamage();
+			damageMode = config.showdamagedrops();
 
 			if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
 			{
@@ -147,7 +147,7 @@ public void onConfigChanged(ConfigChanged event)
 		}
 		else
 		{
-			damageMode = config.showdamage();
+			damageMode = config.showdamagedrops();
 
 			if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
 			{
@@ -343,7 +343,7 @@ public void onExperienceChanged(ExperienceChanged event)
 	@Subscribe
 	public void onScriptCallbackEvent(ScriptCallbackEvent e)
 	{
-		if (config.showdamage() == XpDropConfig.DamageMode.NONE)
+		if (config.showdamagedrops() == XpDropConfig.DamageMode.NONE)
 		{
 			return;
 		}

diff --git a/...nt/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/...nt/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -1197,7 +1197,7 @@ else if (config.swapNexus() && target.contains("portal nexus"))
 			swap(client, "teleport menu", option, target, true);
 		}
 
-		if (config.getTempConstruction() && buildingMode)
+		if (config.getTempConstruction() && buildingMode && !Strings.isNullOrEmpty(config.getTempConstructionItems()))
 		{
 			if (event.getType() == WALK.getId())
 			{