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

Merge pull request #19 from OvercastNetwork/master

Browse Source 
Always remove disguise and update if necessary
This commit is contained in:
libraryaddict 2013-12-20 03:22:47 -08:00
commit 06cb677446
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -379,14 +379,15 @@ public abstract class Disguise {
HashMap<Integer, HashSet<TargetedDisguise>> disguises = DisguiseUtilities.getDisguises();
// If this disguise has a entity set
if (getEntity() != null) {
// If the entity is valid
if (getEntity().isValid()) {
// If this disguise is active
// Remove the disguise from the current disguises.
if (DisguiseUtilities.removeDisguise((TargetedDisguise) this)) {
if (getEntity() instanceof Player) {
DisguiseUtilities.removeSelfDisguise((Player) getEntity());
}
// If this disguise is active
// Remove the disguise from the current disguises.
if (DisguiseUtilities.removeDisguise((TargetedDisguise) this)) {
if (getEntity() instanceof Player) {
DisguiseUtilities.removeSelfDisguise((Player) getEntity());
}
// If the entity is not dead
if (getEntity().isValid()) {
// Better refresh the entity to undisguise it
DisguiseUtilities.refreshTrackers((TargetedDisguise) this);
}