diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java index 6e5425da2..1a8b4b354 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java @@ -21,6 +21,7 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.util.Vector; import mineplex.core.MiniPlugin; +import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; @@ -179,6 +180,16 @@ public class StackerManager extends MiniPlugin implements IThrown UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is not playing stacker.")); return; } + + //YouTuber + if (stackee instanceof Player && Manager.GetClients().Get((Player)stackee).GetRank() == Rank.YOUTUBE) + { + if (!Manager.GetClients().Get(stacker).GetRank().Has(Rank.YOUTUBE)) + { + UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " cannot be stacked! Leave him/her alone!")); + return; + } + } if (stackee instanceof LivingEntity) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/party/commands/PartyCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/party/commands/PartyCommand.java index 63a0d1a8d..225f34ea6 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/party/commands/PartyCommand.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/party/commands/PartyCommand.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilPlayer; import mineplex.hub.party.Party; import mineplex.hub.party.PartyManager; @@ -88,6 +89,16 @@ public class PartyCommand extends CommandBase UtilPlayer.message(caller, F.main("Party", "You cannot Party with yourself.")); return; } + + //YouTuber + if (Plugin.GetClients().Get(target).GetRank() == Rank.YOUTUBE) + { + if (Plugin.GetClients().Get(caller).GetRank().Has(Rank.YOUTUBE)) + { + UtilPlayer.message(caller, F.main("Stacker", "You may not party with " + F.name(UtilEnt.getName(target)) + "! Leave him/her alone!")); + return; + } + } //Invite or Suggest if (party != null)