Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Surround with try/catch

Browse Source
This commit is contained in:
Xephi59 2015-06-29 02:51:39 +02:00
parent 487c91136c
commit 108bb5c357
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java
View File

@ -1,13 +1,15 @@
package fr.xephi.authme.plugin.manager; package fr.xephi.authme.plugin.manager;
import com.trc202.CombatTag.CombatTag;
import com.trc202.CombatTagApi.CombatTagApi;
import net.minelink.ctplus.CombatTagPlus; import net.minelink.ctplus.CombatTagPlus;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import com.trc202.CombatTag.CombatTag;
import com.trc202.CombatTagApi.CombatTagApi;
public abstract class CombatTagComunicator { public abstract class CombatTagComunicator {
public static CombatTagApi combatApi; public static CombatTagApi combatApi;
@ -28,6 +30,9 @@ public abstract class CombatTagComunicator {
return false; return false;
} }
return combatApi.isNPC(player); 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) { } catch (ClassCastException ex) {
return false; return false;
@ -36,10 +41,6 @@ public abstract class CombatTagComunicator {
} catch (NoClassDefFoundError ncdfe) { } catch (NoClassDefFoundError ncdfe) {
return false; return false;
} }
Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("CombatTagPlus");
return (plugin != null && plugin instanceof CombatTagPlus &&
player instanceof Player && ((CombatTagPlus) plugin).getNpcPlayerHelper().isNpc((Player) player));
} }
} }