SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix FQN in DisguiseType

Browse Source
This commit is contained in:
riking 2014-06-04 15:16:45 -07:00
parent d645004abd
commit 3ebf54c192
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
View File

@ -5,6 +5,9 @@ import java.lang.reflect.Method;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Skeleton;
import org.bukkit.entity.Zombie;
public enum DisguiseType { public enum DisguiseType {
ARROW(60), ARROW(60),
@ -170,17 +173,16 @@ public enum DisguiseType {
} }
} }
try { try {
isVillager = org.bukkit.entity.Zombie.class.getMethod("isVillager"); isVillager = Zombie.class.getMethod("isVillager");
} catch (Throwable ignored) { } catch (Throwable ignored) {
// This version doesn't have villagers
} }
try { try {
getVariant = org.bukkit.entity.Horse.class.getMethod("getVariant"); getVariant = Horse.class.getMethod("getVariant");
} catch (Throwable ignored) { } catch (Throwable ignored) {
// This version doesn't have horses // Pre-1.6, but that isn't even supported
} }
try { try {
getSkeletonType = org.bukkit.entity.Skeleton.class.getMethod("getSkeletonType"); getSkeletonType = Skeleton.class.getMethod("getSkeletonType");
} catch (Throwable ignored) { } catch (Throwable ignored) {
} }
} }
@ -208,7 +210,7 @@ public enum DisguiseType {
case SKELETON: case SKELETON:
try { try {
Object type = getSkeletonType.invoke(entity); Object type = getSkeletonType.invoke(entity);
if (type == org.bukkit.entity.Skeleton.SkeletonType.WITHER) { if (type == Skeleton.SkeletonType.WITHER) {
disguiseType = DisguiseType.WITHER_SKELETON; disguiseType = DisguiseType.WITHER_SKELETON;
} }
} catch (Exception ex) { } catch (Exception ex) {