Fixed bossbars disabling self, added support for modded custom entities, disguises now refer to themselves with the right disguise name when possible, cleaned up some code, fixed bossbar error when a server uses a bad bossbar name in their own system

This commit is contained in:
libraryaddict
2020-04-16 00:55:35 +12:00
parent b31fc3a251
commit 8b39450490
33 changed files with 327 additions and 151 deletions

View File

@@ -5,7 +5,6 @@ import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.LibsEntityInteract;
import me.libraryaddict.disguise.utilities.parser.DisguiseParseException;
@@ -71,13 +70,7 @@ public class DisguiseEntityInteraction implements LibsEntityInteract {
DisguiseAPI.disguiseEntity(entity, disguise);
String disguiseName;
if (disguise instanceof PlayerDisguise) {
disguiseName = ((PlayerDisguise) disguise).getName();
} else {
disguiseName = disguise.getType().toReadable();
}
String disguiseName = disguise.getDisguiseName();
// Jeez, maybe I should redo my messages here
if (disguise.isDisguiseInUse()) {