JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mysticates OCD....

This commit is contained in:
Sarah 2016-01-17 02:48:15 +01:00
parent 410bc1c74b
commit 4a5d6b5f2a
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java
View File

@ -10,6 +10,7 @@ import mineplex.serverdata.redis.RedisDataRepository;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
View File

@ -19,6 +19,7 @@ import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.types.GadgetType; import mineplex.core.gadget.types.GadgetType;
import mineplex.core.punish.Category; import mineplex.core.punish.Category;
import mineplex.core.punish.PunishClient;
import mineplex.core.punish.Punishment; import mineplex.core.punish.Punishment;
import mineplex.core.treasure.event.TreasureStartEvent; import mineplex.core.treasure.event.TreasureStartEvent;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
@ -192,6 +193,7 @@ public class DisguiseCommand extends CommandBase<ArcadeManager> implements Liste
{ {
other = new CoreClient(args[0]); other = new CoreClient(args[0]);
Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString()); Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString());
System.out.println(other.getAccountId());
otherRank = other.GetRank(); otherRank = other.GetRank();
} catch(NullPointerException exception) } catch(NullPointerException exception)
{ {
@ -205,19 +207,10 @@ public class DisguiseCommand extends CommandBase<ArcadeManager> implements Liste
boolean canDisguise = true; boolean canDisguise = true;
if(other != null) if(other != null)
{ {
NautHashMap<Category, List<Punishment>> punishments = Plugin.getPunishments().GetClient(args[0]).GetPunishments(); PunishClient pclient = Plugin.getPunishments().GetClient(args[0]);
for(Category punishmentCategorys : punishments.keySet()) if(pclient.IsBanned() || pclient.IsMuted())
{ {
for(Punishment punishment : punishments.get(punishmentCategorys)) canDisguise = false;
{
if(punishment.GetActive())
{
canDisguise = false;
break;
}
}
if(!canDisguise)
break;
} }
} }
if(!canDisguise) if(!canDisguise)