From d09b27bfe19f634f1555e289563b4a07b2485b55 Mon Sep 17 00:00:00 2001 From: samczsun Date: Tue, 30 Aug 2016 11:01:40 -0400 Subject: [PATCH] Fix disguises prevent join, join rank check bugs --- .../disguise/playerdisguise/PlayerDisguiseManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java index e7ff8c3d6..317d6cc26 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java @@ -161,6 +161,9 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler { CoreClient client = _clients.Get(event.getPlayer()); + if (!client.GetRank().has(event.getPlayer(), Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, false)) + return; + if (_redis.elementExists(client.getAccountId() + client.getName())) { DisguisePlayerBean bean = _redis.getElement(client.getAccountId() + client.getName()); @@ -263,11 +266,6 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler return this._punish; } - public CosmeticManager getCostmeticManager() - { - return this._cosmetics; - } - public PreferencesManager getPreferencesManager() { return this._prefs; @@ -439,6 +437,7 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler if (other.getName().equalsIgnoreCase(requestedUsername)) { UtilPlayer.message(caller, C.cRed + F.main("Disguise", "This name is already in use!")); + _cannotJoin.remove(requestedUsername.toLowerCase()); return; } }