From 108bb5c357232584b7bae02fb6ddb7b259179a80 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Mon, 29 Jun 2015 02:51:39 +0200 Subject: [PATCH] Surround with try/catch --- .../authme/plugin/manager/CombatTagComunicator.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java b/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java index 974be678f..314a4f19f 100644 --- a/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java +++ b/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java @@ -1,13 +1,15 @@ package fr.xephi.authme.plugin.manager; -import com.trc202.CombatTag.CombatTag; -import com.trc202.CombatTagApi.CombatTagApi; import net.minelink.ctplus.CombatTagPlus; + import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import com.trc202.CombatTag.CombatTag; +import com.trc202.CombatTagApi.CombatTagApi; + public abstract class CombatTagComunicator { public static CombatTagApi combatApi; @@ -28,6 +30,9 @@ public abstract class CombatTagComunicator { return false; } return combatApi.isNPC(player); + } else { + Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("CombatTagPlus"); + return (plugin != null && plugin instanceof CombatTagPlus && player instanceof Player && ((CombatTagPlus) plugin).getNpcPlayerHelper().isNpc((Player) player)); } } catch (ClassCastException ex) { return false; @@ -36,10 +41,6 @@ public abstract class CombatTagComunicator { } catch (NoClassDefFoundError ncdfe) { return false; } - - Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("CombatTagPlus"); - return (plugin != null && plugin instanceof CombatTagPlus && - player instanceof Player && ((CombatTagPlus) plugin).getNpcPlayerHelper().isNpc((Player) player)); } }