From 410bc1c74bb7a8a89e0547a89d05dd9dc17c62ca Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 15 Jan 2016 19:12:50 +0100 Subject: [PATCH 1/6] not being able to disguise as banned/muted players --- .../src/mineplex/hub/HubManager.java | 18 ++--- .../hub/commands/DisguiseCommand.java | 33 ++++++++- .../src/nautilus/game/arcade/Arcade.java | 2 +- .../nautilus/game/arcade/ArcadeManager.java | 67 +++++++++++-------- .../game/arcade/command/DisguiseCommand.java | 34 +++++++++- 5 files changed, 111 insertions(+), 43 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 24be3b3dc..cd8a20421 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -4,7 +4,6 @@ import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.nio.file.Files; import java.util.ArrayList; import java.util.HashMap; import java.util.Random; @@ -21,8 +20,6 @@ import mineplex.core.botspam.BotSpamManager; import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilAction; -import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; @@ -37,8 +34,8 @@ import mineplex.core.disguise.PlayerDisguiseManager; import mineplex.core.disguise.disguises.DisguiseSlime; import mineplex.core.donation.DonationManager; import mineplex.core.gadget.GadgetManager; -import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.event.GadgetCollideEntityEvent; +import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.types.GadgetType; import mineplex.core.giveaway.GiveawayManager; import mineplex.core.hologram.HologramManager; @@ -91,7 +88,6 @@ import mineplex.minecraft.game.classcombat.item.event.ItemTriggerEvent; import mineplex.minecraft.game.core.combat.DeathMessageType; import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; import mineplex.minecraft.game.core.condition.ConditionManager; -import mineplex.minecraft.game.core.damage.CustomDamageEvent; import net.minecraft.server.v1_8_R3.EntityInsentient; import net.minecraft.server.v1_8_R3.EntityPlayer; @@ -105,11 +101,8 @@ import org.bukkit.entity.Egg; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.Snowball; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; -import org.bukkit.event.block.BlockDamageEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityTargetEvent.TargetReason; @@ -126,7 +119,6 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerVelocityEvent; import org.bukkit.event.server.ServerListPingEvent; import org.bukkit.event.world.ChunkLoadEvent; -import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Objective; @@ -163,6 +155,7 @@ public class HubManager extends MiniClientPlugin private PersonalServerManager _personalServerManager; private PlayerCountManager _playerCountManager; private CustomDataManager _customDataManager; + private Punish _punishManager; // private HalloweenSpookinessManager _halloweenManager; // private TrickOrTreatManager _trickOrTreatManager; @@ -259,6 +252,8 @@ public class HubManager extends MiniClientPlugin _customDataManager = new CustomDataManager(plugin, clientManager); _songs = new ArrayList(); + + _punishManager = punish; try { @@ -868,6 +863,11 @@ public class HubManager extends MiniClientPlugin { return _customDataManager; } + + public Punish getPunishments() + { + return _punishManager; + } // public HalloweenSpookinessManager getHalloweenManager() // { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java index ed9c0487b..c8d80ec9b 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java @@ -1,6 +1,7 @@ package mineplex.hub.commands; import java.lang.reflect.Field; +import java.util.List; import java.util.UUID; import mineplex.core.account.CoreClient; @@ -17,6 +18,8 @@ import mineplex.core.disguise.PlayerUndisguiseEvent; import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.types.GadgetType; +import mineplex.core.punish.Category; +import mineplex.core.punish.Punishment; import mineplex.core.treasure.event.TreasureStartEvent; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -182,18 +185,44 @@ public class DisguiseCommand extends CommandBase implements Listener } Rank otherRank = Rank.ALL; + CoreClient other = null; try { - CoreClient other = new CoreClient(args[0]); + other = new CoreClient(args[0]); Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString()); otherRank = other.GetRank(); } catch(NullPointerException exception) - {} + { + other = null; + } if(otherRank.has(Rank.TWITCH)) { UtilPlayer.message(caller, F.main("Disguise", "You can't disguise as staff, Youtubers or Twitchers!")); return; } + boolean canDisguise = true; + if(other != null) + { + NautHashMap> punishments = Plugin.getPunishments().GetClient(args[0]).GetPunishments(); + for(Category punishmentCategorys : punishments.keySet()) + { + for(Punishment punishment : punishments.get(punishmentCategorys)) + { + if(punishment.GetActive()) + { + canDisguise = false; + break; + } + } + if(!canDisguise) + break; + } + } + if(!canDisguise) + { + UtilPlayer.message(caller, F.main("Disguise", "Unable to disguise as this Player!")); + return; + } _disguisedPlayers.put(caller, profile); _disguisedPlayersNames.put(caller, caller.getName()); client.setDisguisedRank(otherRank); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index e2ca772b3..fa906ae0f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -156,7 +156,7 @@ public class Arcade extends JavaPlugin //Arcade Manager PollManager pollManager = new PollManager(this, _clientManager, _donationManager); - _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, statsManager, achievementManager, disguiseManager, creature, teleport, new Blood(this), chat, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress, pollManager, npcmanager, giveawayManager, customDataManager); + _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, statsManager, achievementManager, disguiseManager, creature, teleport, new Blood(this), chat, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress, pollManager, npcmanager, giveawayManager, customDataManager, punish); new MemoryFix(this); new CustomTagFix(this, packetHandler); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index db787f98e..3f968ad6c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -4,34 +4,6 @@ import java.io.File; import java.util.ArrayList; import java.util.HashSet; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.GameMode; -import org.bukkit.Material; -import org.bukkit.OfflinePlayer; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.HandlerList; -import org.bukkit.event.block.BlockBurnEvent; -import org.bukkit.event.block.BlockFadeEvent; -import org.bukkit.event.block.BlockSpreadEvent; -import org.bukkit.event.block.LeavesDecayEvent; -import org.bukkit.event.entity.CreatureSpawnEvent; -import org.bukkit.event.entity.EntityExplodeEvent; -import org.bukkit.event.inventory.InventoryType; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.event.server.ServerListPingEvent; -import org.bukkit.potion.PotionEffect; -import org.bukkit.util.Vector; - import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; @@ -71,6 +43,7 @@ import mineplex.core.poll.PollManager; import mineplex.core.portal.Portal; import mineplex.core.preferences.PreferencesManager; import mineplex.core.projectile.ProjectileManager; +import mineplex.core.punish.Punish; import mineplex.core.resourcepack.ResourcePackManager; import mineplex.core.reward.RewardData; import mineplex.core.reward.RewardRarity; @@ -128,6 +101,34 @@ import nautilus.game.arcade.managers.IdleManager; import nautilus.game.arcade.managers.MiscManager; import nautilus.game.arcade.player.ArcadePlayer; import nautilus.game.arcade.shop.ArcadeShop; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.GameMode; +import org.bukkit.Material; +import org.bukkit.OfflinePlayer; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.HandlerList; +import org.bukkit.event.block.BlockBurnEvent; +import org.bukkit.event.block.BlockFadeEvent; +import org.bukkit.event.block.BlockSpreadEvent; +import org.bukkit.event.block.LeavesDecayEvent; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.inventory.InventoryType; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerLoginEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.server.ServerListPingEvent; +import org.bukkit.potion.PotionEffect; +import org.bukkit.util.Vector; public class ArcadeManager extends MiniPlugin implements IRelation { @@ -182,6 +183,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation private GiveawayManager _giveawayManager; private ResourcePackManager _resourcePackManager; private CustomDataManager _customDataManager; + private Punish _punishmentManager; private TaskManager _taskManager; private PacketHandler _packetHandler; @@ -206,7 +208,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation StatsManager statsManager, AchievementManager achievementManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Chat chat, Portal portal, PreferencesManager preferences, InventoryManager inventoryManager, PacketHandler packetHandler, CosmeticManager cosmeticManager, ProjectileManager projectileManager, PetManager petManager, HologramManager hologramManager, String webAddress, PollManager pollManager, - NpcManager npcManager, GiveawayManager giveawayManager, CustomDataManager customDataManager) + NpcManager npcManager, GiveawayManager giveawayManager, CustomDataManager customDataManager, Punish punish) { super("Game Manager", plugin); @@ -321,6 +323,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation _eloManager = new EloManager(_plugin, clientManager); + _punishmentManager = punish; + if (GetHost() != null && !GetHost().isEmpty()) { Bukkit.getScheduler().runTaskLater(plugin, new Runnable() @@ -449,6 +453,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation { return _projectileManager; } + + public Punish getPunishments() + { + return _punishmentManager; + } public Portal GetPortal() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java index f390e7793..8e164a323 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java @@ -1,6 +1,7 @@ package nautilus.game.arcade.command; import java.lang.reflect.Field; +import java.util.List; import java.util.UUID; import mineplex.core.account.CoreClient; @@ -17,6 +18,8 @@ import mineplex.core.disguise.PlayerUndisguiseEvent; import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.types.GadgetType; +import mineplex.core.punish.Category; +import mineplex.core.punish.Punishment; import mineplex.core.treasure.event.TreasureStartEvent; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -184,18 +187,45 @@ public class DisguiseCommand extends CommandBase implements Liste } Rank otherRank = Rank.ALL; + CoreClient other = null; try { - CoreClient other = new CoreClient(args[0]); + other = new CoreClient(args[0]); Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString()); otherRank = other.GetRank(); } catch(NullPointerException exception) - {} + { + other = null; + } if(otherRank.has(Rank.TWITCH)) { UtilPlayer.message(caller, F.main("Disguise", "You can't disguise as staff, Youtubers or Twitchers!")); return; } + boolean canDisguise = true; + if(other != null) + { + NautHashMap> punishments = Plugin.getPunishments().GetClient(args[0]).GetPunishments(); + for(Category punishmentCategorys : punishments.keySet()) + { + for(Punishment punishment : punishments.get(punishmentCategorys)) + { + if(punishment.GetActive()) + { + canDisguise = false; + break; + } + } + if(!canDisguise) + break; + } + } + if(!canDisguise) + { + UtilPlayer.message(caller, F.main("Disguise", "Unable to disguise as this Player!")); + return; + } + _disguisedPlayers.put(caller, profile); _disguisedPlayersNames.put(caller, caller.getName()); client.setDisguisedRank(otherRank); From 4a5d6b5f2a6b36687cc5a9512be9760d38d9346e Mon Sep 17 00:00:00 2001 From: Sarah Date: Sun, 17 Jan 2016 02:48:15 +0100 Subject: [PATCH 2/6] Mysticates OCD.... --- .../core/disguise/PlayerDisguiseManager.java | 1 + .../game/arcade/command/DisguiseCommand.java | 17 +++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java index d7a900895..82e27bb5f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java @@ -10,6 +10,7 @@ import mineplex.serverdata.redis.RedisDataRepository; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; +import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java index 8e164a323..d6a509845 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java @@ -19,6 +19,7 @@ import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.types.GadgetType; import mineplex.core.punish.Category; +import mineplex.core.punish.PunishClient; import mineplex.core.punish.Punishment; import mineplex.core.treasure.event.TreasureStartEvent; import mineplex.core.updater.UpdateType; @@ -192,6 +193,7 @@ public class DisguiseCommand extends CommandBase implements Liste { other = new CoreClient(args[0]); Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString()); + System.out.println(other.getAccountId()); otherRank = other.GetRank(); } catch(NullPointerException exception) { @@ -205,19 +207,10 @@ public class DisguiseCommand extends CommandBase implements Liste boolean canDisguise = true; if(other != null) { - NautHashMap> punishments = Plugin.getPunishments().GetClient(args[0]).GetPunishments(); - for(Category punishmentCategorys : punishments.keySet()) + PunishClient pclient = Plugin.getPunishments().GetClient(args[0]); + if(pclient.IsBanned() || pclient.IsMuted()) { - for(Punishment punishment : punishments.get(punishmentCategorys)) - { - if(punishment.GetActive()) - { - canDisguise = false; - break; - } - } - if(!canDisguise) - break; + canDisguise = false; } } if(!canDisguise) From 52bda30f85ed460613f7cb184294555f569a3002 Mon Sep 17 00:00:00 2001 From: Sarah Date: Sun, 17 Jan 2016 03:03:00 +0100 Subject: [PATCH 3/6] Mysts OCD again...... --- .../nautilus/game/arcade/command/DisguiseCommand.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java index d6a509845..c50071cf6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java @@ -204,20 +204,15 @@ public class DisguiseCommand extends CommandBase implements Liste UtilPlayer.message(caller, F.main("Disguise", "You can't disguise as staff, Youtubers or Twitchers!")); return; } - boolean canDisguise = true; if(other != null) { PunishClient pclient = Plugin.getPunishments().GetClient(args[0]); if(pclient.IsBanned() || pclient.IsMuted()) { - canDisguise = false; + UtilPlayer.message(caller, F.main("Disguise", "Unable to disguise as this Player!")); + return; } } - if(!canDisguise) - { - UtilPlayer.message(caller, F.main("Disguise", "Unable to disguise as this Player!")); - return; - } _disguisedPlayers.put(caller, profile); _disguisedPlayersNames.put(caller, caller.getName()); From 5ed92959447b34ba9173e83b349d7482121e98a0 Mon Sep 17 00:00:00 2001 From: Sarah Date: Sun, 17 Jan 2016 18:10:16 +0100 Subject: [PATCH 4/6] updating Hub command as well --- .../hub/commands/DisguiseCommand.java | 23 ++++--------------- .../game/arcade/command/DisguiseCommand.java | 1 - 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java index c8d80ec9b..6e956c11a 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java @@ -19,6 +19,7 @@ import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.gadget.event.GadgetEnableEvent; import mineplex.core.gadget.types.GadgetType; import mineplex.core.punish.Category; +import mineplex.core.punish.PunishClient; import mineplex.core.punish.Punishment; import mineplex.core.treasure.event.TreasureStartEvent; import mineplex.core.updater.UpdateType; @@ -200,29 +201,15 @@ public class DisguiseCommand extends CommandBase implements Listener UtilPlayer.message(caller, F.main("Disguise", "You can't disguise as staff, Youtubers or Twitchers!")); return; } - boolean canDisguise = true; if(other != null) { - NautHashMap> punishments = Plugin.getPunishments().GetClient(args[0]).GetPunishments(); - for(Category punishmentCategorys : punishments.keySet()) + PunishClient pclient = Plugin.getPunishments().GetClient(args[0]); + if(pclient.IsBanned() || pclient.IsMuted()) { - for(Punishment punishment : punishments.get(punishmentCategorys)) - { - if(punishment.GetActive()) - { - canDisguise = false; - break; - } - } - if(!canDisguise) - break; + UtilPlayer.message(caller, F.main("Disguise", "Unable to disguise as this Player!")); + return; } } - if(!canDisguise) - { - UtilPlayer.message(caller, F.main("Disguise", "Unable to disguise as this Player!")); - return; - } _disguisedPlayers.put(caller, profile); _disguisedPlayersNames.put(caller, caller.getName()); client.setDisguisedRank(otherRank); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java index c50071cf6..77be6aa68 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java @@ -193,7 +193,6 @@ public class DisguiseCommand extends CommandBase implements Liste { other = new CoreClient(args[0]); Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString()); - System.out.println(other.getAccountId()); otherRank = other.GetRank(); } catch(NullPointerException exception) { From 044d2bac83da2c423f4e8e922f14ffe65cc7743b Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Sun, 17 Jan 2016 22:55:04 -0500 Subject: [PATCH 5/6] Fix some Invisibility preference bugs --- .../src/mineplex/hub/modules/HubVisibilityManager.java | 3 ++- .../Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubVisibilityManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubVisibilityManager.java index b7167cf07..75abcbfbd 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubVisibilityManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubVisibilityManager.java @@ -63,9 +63,10 @@ public class HubVisibilityManager extends MiniPlugin for (Player player : UtilServer.getPlayers()) { + Rank rank = Manager.GetClients().Get(player).GetRank(); boolean hideMe = Manager.GetTutorial().InTutorial(player) || UtilMath.offset2d(player.getLocation(), Manager.GetSpawn()) == 0 || - (Manager.getPreferences().Get(player).Invisibility && Manager.GetClients().Get(player).GetRank().has(Rank.MODERATOR)) || + (Manager.getPreferences().Get(player).Invisibility && (rank.has(Rank.MODERATOR) || rank == Rank.YOUTUBE || rank == Rank.TWITCH)) || _hiddenPlayers.contains(player); for (Player other : UtilServer.getPlayers()) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java index b6882a1f9..e0367bdba 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java @@ -43,8 +43,9 @@ public class JumpManager extends MiniPlugin if (player.getGameMode() == GameMode.CREATIVE) return; - - if (Manager.getPreferences().Get(player).Invisibility) + + Rank rank = Manager.GetClients().Get(player).GetRank(); + if (Manager.getPreferences().Get(player).Invisibility && (rank.has(Rank.MODERATOR) || rank == Rank.YOUTUBE || rank == Rank.TWITCH)) { return; } From 951c27123a2202840e5e509b5f0bcc1327b0d383 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Mon, 18 Jan 2016 22:10:01 -0500 Subject: [PATCH 6/6] Remove /disguise for YOUTUBE_SMALL in arcade --- .../src/nautilus/game/arcade/command/DisguiseCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java index 77be6aa68..632317ab5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java @@ -67,7 +67,7 @@ public class DisguiseCommand extends CommandBase implements Liste public DisguiseCommand(ArcadeManager plugin) { - super(plugin, Rank.JNR_DEV, new Rank[] {Rank.YOUTUBE, Rank.TWITCH, Rank.YOUTUBE_SMALL}, "disguise"); + super(plugin, Rank.JNR_DEV, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, "disguise"); plugin.getPluginManager().registerEvents(this, Plugin.getPlugin()); }