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

Fixed disguise entity command throwing errors. Cleaned up the messages moar

Browse Source
This commit is contained in:
libraryaddict 2014-05-14 10:54:44 +12:00
parent 3604c83797
commit 0b5e20180d
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/me/libraryaddict/disguise/DisguiseListener.java
View File

@ -3,6 +3,7 @@ package me.libraryaddict.disguise;
import java.util.HashMap; import java.util.HashMap;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise; import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@ -123,12 +124,17 @@ public class DisguiseListener implements Listener {
Disguise disguise = disguiseSlap.remove(event.getPlayer().getName()); Disguise disguise = disguiseSlap.remove(event.getPlayer().getName());
disguiseRunnable.remove(event.getPlayer().getName()).cancel(); disguiseRunnable.remove(event.getPlayer().getName()).cancel();
Entity entity = event.getRightClicked(); Entity entity = event.getRightClicked();
String entityName = entity.getType().name().toLowerCase().replace("_", " "); String entityName = "";
if (entity instanceof Player) { if (entity instanceof Player) {
entityName = ((Player) entity).getName(); entityName = ((Player) entity).getName();
} else { } else {
String[] split = entity.getType().name().split("_"); String[] split = entity.getType().name().split("_");
entityName = split[0].substring(1).toLowerCase() + " " + split[1].substring(1).toLowerCase(); for (int i = 0; i < split.length; i++) {
entityName += split[0].substring(0, 1) + split[0].substring(1).toLowerCase();
if (i + 1 < split.length) {
entityName += " ";
}
}
} }
if (disguise != null) { if (disguise != null) {
if (entity instanceof Player && DisguiseConfig.isNameOfPlayerShownAboveDisguise()) { if (entity instanceof Player && DisguiseConfig.isNameOfPlayerShownAboveDisguise()) {
@ -140,9 +146,21 @@ public class DisguiseListener implements Listener {
} }
} }
DisguiseAPI.disguiseToAll(entity, disguise); DisguiseAPI.disguiseToAll(entity, disguise);
String disguiseName = "a ";
if (disguise instanceof PlayerDisguise) {
disguiseName = "the player " + ((PlayerDisguise) disguise).getName();
} else {
String[] split = disguise.getType().name().split("_");
for (int i = 0; i < split.length; i++) {
disguiseName += split[0].substring(0, 1) + split[0].substring(1).toLowerCase();
if (i + 1 < split.length) {
disguiseName += " ";
}
}
}
event.getPlayer().sendMessage( event.getPlayer().sendMessage(
ChatColor.RED + "Disguised " + (entity instanceof Player ? "" : "the ") + entityName + " as a " ChatColor.RED + "Disguised " + (entity instanceof Player ? "" : "the ") + entityName + " as "
+ disguise.getType().name().toLowerCase().replace("_", " ") + "!"); + disguiseName + "!");
} else { } else {
if (DisguiseAPI.isDisguised(entity)) { if (DisguiseAPI.isDisguised(entity)) {
DisguiseAPI.undisguiseToAll(entity); DisguiseAPI.undisguiseToAll(entity);