Various Fixes (#450)

This commit is contained in:
Ganom
2019-05-30 17:13:46 -04:00
committed by Kyleeld
parent c047edba1f
commit 83fd69c48e
3 changed files with 7 additions and 7 deletions

View File

@@ -95,12 +95,12 @@ public interface XpDropConfig extends Config
} }
@ConfigItem( @ConfigItem(
keyName = "showDamage", keyName = "showdamagedrops",
name = "Show Damage on XP Drop", name = "Show Damage on XP Drop",
description = "Show what you hit next to the XP drop", description = "Show what you hit next to the XP drop",
position = 5 position = 5
) )
default DamageMode showdamage() default DamageMode showdamagedrops()
{ {
return DamageMode.NONE; return DamageMode.NONE;
} }

View File

@@ -113,7 +113,7 @@ public class XpDropPlugin extends Plugin
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
damageMode = config.showdamage(); damageMode = config.showdamagedrops();
if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT) if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
{ {
@@ -138,7 +138,7 @@ public class XpDropPlugin extends Plugin
if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT) if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
{ {
damageMode = config.showdamage(); damageMode = config.showdamagedrops();
if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT) if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
{ {
@@ -147,7 +147,7 @@ public class XpDropPlugin extends Plugin
} }
else else
{ {
damageMode = config.showdamage(); damageMode = config.showdamagedrops();
if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT) if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
{ {
@@ -343,7 +343,7 @@ public class XpDropPlugin extends Plugin
@Subscribe @Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent e) public void onScriptCallbackEvent(ScriptCallbackEvent e)
{ {
if (config.showdamage() == XpDropConfig.DamageMode.NONE) if (config.showdamagedrops() == XpDropConfig.DamageMode.NONE)
{ {
return; return;
} }

View File

@@ -1197,7 +1197,7 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "teleport menu", option, target, true); swap(client, "teleport menu", option, target, true);
} }
if (config.getTempConstruction() && buildingMode) if (config.getTempConstruction() && buildingMode && !Strings.isNullOrEmpty(config.getTempConstructionItems()))
{ {
if (event.getType() == WALK.getId()) if (event.getType() == WALK.getId())
{ {