diff --git a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/NautHashMap.java b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/NautHashMap.java index 41f9d442c..228543e50 100644 --- a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/NautHashMap.java +++ b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/NautHashMap.java @@ -20,7 +20,7 @@ public class NautHashMap { Validate.isTrue(keys.length == values.length, "Keys array and values array must be the same size when making a Map"); - UtilCollections.loop(0, keys.length, i -> _wrappedHashMap.put(keys[i.intValue()], values[i.intValue()])); + UtilCollections.loop(0, keys.length, i -> _wrappedHashMap.put(keys[i], values[i])); } public boolean containsKey(KeyType key) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java index 01f8a72e1..0c6a0e75e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java @@ -739,7 +739,7 @@ public class CoreClientManager extends MiniPlugin { _repository.fetchGroups(accountId, (primaryGroup, additionalGroups) -> { - if (primaryGroup == null) + if (primaryGroup != null) { UtilServer.runSync(() -> resultCallback.accept(primaryGroup, additionalGroups)); return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/ResetPlayerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/ResetPlayerCommand.java index 77e3a05f4..5405eddc0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/ResetPlayerCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/ResetPlayerCommand.java @@ -76,15 +76,15 @@ public class ResetPlayerCommand extends CommandBase { Plugin.runSync(() -> { - if (id.intValue() == -1) + if (id == -1) { UtilPlayer.message(caller, F.main(Plugin.getName(), F.elem(target) + " was not found!")); } else { - Plugin.clearGroups(id.intValue(), success -> + Plugin.clearGroups(id, success -> { - if (success.booleanValue()) + if (success) { UtilPlayer.message(caller, F.main(Plugin.getName(), "You have cleared " + F.elem(target + "'s") + " ranks!")); } @@ -101,4 +101,4 @@ public class ResetPlayerCommand extends CommandBase }); }); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java index 2b1e84881..9129d4a85 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java @@ -360,7 +360,7 @@ public class AccountRepository extends MinecraftRepository } } - executeUpdate(c, UPDATE_PRIMARY_RANK, () -> {}, new ColumnVarChar("rankIdentifier", "player".length(), "player"), new ColumnInt("accountId", accountId)); + executeUpdate(c, UPDATE_PRIMARY_RANK, () -> {}, new ColumnVarChar("rankIdentifier", 255, "PLAYER"), new ColumnInt("accountId", accountId)); executeUpdate(c, REMOVE_ADDITIONAL_RANKS, () -> success.set(false), new ColumnInt("accountId", accountId)); } catch (SQLException e) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java index dd6414156..dd0f29fd8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java @@ -12,14 +12,14 @@ import mineplex.core.gadget.types.WinEffectGadget; */ public abstract class WinEffectRankBased extends WinEffectGadget { - + private static final String RANK_SCHEMATIC_PREFIX = "WinRank"; private final PermissionGroup _rank; public WinEffectRankBased(GadgetManager manager, String name, String[] lore, Material material, byte data, int cost, PermissionGroup rank, String... alternativeSalepackageNames) { super(manager, name, lore, cost, material, data, true, alternativeSalepackageNames); _rank = rank; - _schematicName = "WinRank" + _rank.getDisplay(false, false, false, false); + _schematicName = RANK_SCHEMATIC_PREFIX + rank.name(); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/TabListSorter.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/TabListSorter.java new file mode 100644 index 000000000..cee66406f --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/TabListSorter.java @@ -0,0 +1,99 @@ +package mineplex.core.scoreboard; + +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo; + +import org.bukkit.entity.Player; + +import mineplex.core.MiniPlugin; +import mineplex.core.account.permissions.Permission; +import mineplex.core.account.permissions.PermissionGroup; +import mineplex.core.command.CommandBase; +import mineplex.core.packethandler.IPacketHandler; +import mineplex.core.packethandler.PacketHandler; +import mineplex.core.packethandler.PacketInfo; + +/** + * Sorts the tab list by rank weight (or some other arbitrary metric if you want) + * @author Dan + */ +public class TabListSorter extends MiniPlugin implements IPacketHandler +{ + public enum Perm implements Permission + { + RANDOM_TAB_LIST + } + + private static final Map WEIGHT; + + static + { + WEIGHT = new HashMap<>(); + for (PermissionGroup group : PermissionGroup.values()) + { + if (group.canBePrimary()) + { + WEIGHT.put(group, group.ordinal()); + } + } + } + + private PacketHandler _packetHandler; + private boolean _randomized = false; + + public TabListSorter() + { + super("TabListSorter"); + + generatePermissions(); + + // /randomtab - straightforward toggle + addCommand(new CommandBase(this, Perm.RANDOM_TAB_LIST, "randomtab") + { + @Override + public void Execute(Player caller, String[] args) + { + _randomized = !_randomized; + } + }); + } + + private void generatePermissions() + { + PermissionGroup.DEV.setPermission(Perm.RANDOM_TAB_LIST, true, true); + } + + @Override + public void enable() + { + _packetHandler = require(PacketHandler.class); + _packetHandler.addPacketHandler(this, PacketPlayOutPlayerInfo.class); + } + + @Override + public void disable() + { + _packetHandler.removePacketHandler(this); + } + + @Override + public void handle(PacketInfo packetInfo) + { + if (packetInfo.getPacket() instanceof PacketPlayOutPlayerInfo) + { + PacketPlayOutPlayerInfo packet = (PacketPlayOutPlayerInfo) packetInfo.getPacket(); + + if (_randomized) + { + Collections.shuffle(packet.b); + } else + { + packet.b.sort(Comparator.comparingInt(info -> WEIGHT.getOrDefault(info, 0))); + } + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java index 042dae4cf..52b4d8ab1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java @@ -93,12 +93,12 @@ public class Teleport extends MiniPlugin { runSync(() -> { - Player p = Bukkit.getPlayer(command.getUUID()); + Player p = Bukkit.getPlayer(command.getReceivingPlayerUUID()); - Integer taskId = _failedRankLocates.remove(command.getReceivingPlayerUUID()); + Integer taskId = _failedRankLocates.remove(command.getUUID()); if (taskId != null) { - getScheduler().cancelTask(taskId.intValue()); + getScheduler().cancelTask(taskId); UtilPlayer.message(p, F.main("Locate", "All Online:")); } @@ -137,7 +137,7 @@ public class Teleport extends MiniPlugin Integer taskId = _failedRedisLocates.remove(callback.getUUID()); if (taskId != null) { - getScheduler().cancelTask(taskId.intValue()); + getScheduler().cancelTask(taskId); } Player player = Bukkit.getPlayer(callback.getReceivingPlayerId()); @@ -162,7 +162,6 @@ public class Teleport extends MiniPlugin private void generatePermissions() { - PermissionGroup.TRAINEE.setPermission(Perm.FIND_COMMAND, true, true); PermissionGroup.MC.setPermission(Perm.FIND_MOD_COMMAND, false, true); PermissionGroup.ADMIN.setPermission(Perm.FIND_MOD_COMMAND, true, true); @@ -202,7 +201,7 @@ public class Teleport extends MiniPlugin UtilPlayer.message(player, F.main("Locate", C.mBody + "Failed to locate [" + C.mElem + target + C.mBody + "].")); }, 40L).getTaskId(); - _failedRedisLocates.put(locate.getUUID(), Integer.valueOf(id)); + _failedRedisLocates.put(locate.getUUID(), id); } public void locateRank(final Player sender, final PermissionGroup group) @@ -221,7 +220,7 @@ public class Teleport extends MiniPlugin UtilPlayer.message(sender, F.main("Locate", "There are no members of that group online!")); }, 60L).getTaskId(); - _failedRankLocates.put(locate.getUUID(), Integer.valueOf(id)); + _failedRankLocates.put(locate.getUUID(), id); } @EventHandler diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java index cdc25cdf0..961b2b368 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java @@ -39,8 +39,8 @@ public class ClansAdmin private void generatePermissions() { - PermissionGroup.ADMIN.setPermission(Perm.USE_ADMIN_COMMANDS, true, true); + PermissionGroup.CMOD.setPermission(Perm.USE_ADMIN_COMMANDS, false, true); } public void command(Player caller, String[] args) @@ -936,4 +936,4 @@ public class ClansAdmin //Inform UtilPlayer.message(caller, F.main("Clans Admin", "Territory Safe Zone: " + F.tf(claim.isSafe(caller.getLocation())))); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java index 444e10a34..e53c746bb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java @@ -52,7 +52,7 @@ public class ObserverManager extends MiniPlugin private void generatePermissions() { - PermissionGroup.TRAINEE.setPermission(Perm.OBSERVE_COMMAND, false, true); + PermissionGroup.TRAINEE.setPermission(Perm.OBSERVE_COMMAND, true, true); } public void setObserver(Player player) @@ -200,4 +200,4 @@ public class ObserverManager extends MiniPlugin { addCommand(new ObserverCommand(this)); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java index 17fd1a298..6d41a014e 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java @@ -115,6 +115,7 @@ import mineplex.core.projectile.ProjectileManager; import mineplex.core.punish.Punish; import mineplex.core.scoreboard.MineplexScoreboard; import mineplex.core.scoreboard.ScoreboardManager; +import mineplex.core.scoreboard.TabListSorter; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; @@ -275,7 +276,7 @@ public class HubManager extends MiniPlugin implements IChatMessageFormatter new PersonalServerManager(plugin, _clientManager).setUseInterfaceItem(false); new CommunityManager(plugin, _clientManager); - + require(TabListSorter.class); ScoreboardManager scoreboardManager = new ScoreboardManager(plugin) { @Override @@ -1080,4 +1081,4 @@ public class HubManager extends MiniPlugin implements IChatMessageFormatter } } } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementRepository.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementRepository.java index dfe9516af..a2637ba48 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementRepository.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementRepository.java @@ -153,7 +153,7 @@ public class SalesAnnouncementRepository extends RepositoryBase { runAsync(() -> { - executeUpdate(UPDATE_ANNOUNCEMENT_STATUS, new ColumnBoolean("enabled", data.isEnabled()), new ColumnInt("id", data.getId().intValue())); + executeUpdate(UPDATE_ANNOUNCEMENT_STATUS, new ColumnBoolean("enabled", data.isEnabled()), new ColumnInt("id", data.getId())); if (after != null) { runSync(after); @@ -165,7 +165,7 @@ public class SalesAnnouncementRepository extends RepositoryBase { runAsync(() -> { - executeUpdate(DELETE_ANNOUNCEMENT, new ColumnInt("id", data.getId().intValue())); + executeUpdate(DELETE_ANNOUNCEMENT, new ColumnInt("id", data.getId())); if (after != null) { runSync(after); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index f15d8aa07..253ad4bd0 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -109,6 +109,7 @@ import mineplex.core.punish.Punish; import mineplex.core.quests.QuestManager; import mineplex.core.scoreboard.MineplexScoreboard; import mineplex.core.scoreboard.ScoreboardManager; +import mineplex.core.scoreboard.TabListSorter; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; @@ -308,6 +309,8 @@ public class HubManager extends MiniClientPlugin implements IChatMess new TemporaryGemHuntersServerSender(_portal); + require(TabListSorter.class); + ScoreboardManager scoreboardManager = new ScoreboardManager(plugin) { @Override diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeEternalCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeEternalCommand.java index f7e719020..cdf768fbe 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeEternalCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeEternalCommand.java @@ -18,7 +18,7 @@ public class LifetimeEternalCommand extends CommandBase public void Execute(Player caller, String[] args) { resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " ETERNAL true")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " ETERNAL")); resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales item " + args[0] + " 2 Item Mythical Chest")); @@ -29,4 +29,4 @@ public class LifetimeEternalCommand extends CommandBase resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales item " + args[0] + " 1 Item Omega Chest")); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeHeroCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeHeroCommand.java index 8e3d6a592..3c563b621 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeHeroCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeHeroCommand.java @@ -18,9 +18,9 @@ public class LifetimeHeroCommand extends CommandBase public void Execute(Player caller, String[] args) { resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " HERO true")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " HERO")); resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales item " + args[0] + " 2 Item Mythical Chest")); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeLegendCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeLegendCommand.java index a3df06814..d913a7591 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeLegendCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeLegendCommand.java @@ -18,9 +18,9 @@ public class LifetimeLegendCommand extends CommandBase public void Execute(Player caller, String[] args) { resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " LEGEND true")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " LEGEND")); resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales item " + args[0] + " 3 Item Mythical Chest")); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeTitanCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeTitanCommand.java index a76e93398..4b5af7939 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeTitanCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeTitanCommand.java @@ -18,9 +18,9 @@ public class LifetimeTitanCommand extends CommandBase public void Execute(Player caller, String[] args) { resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " TITAN true")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " TITAN")); resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales item " + args[0] + " 5 Item Mythical Chest")); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeUltraCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeUltraCommand.java index a91dff857..701fb1283 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeUltraCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeUltraCommand.java @@ -18,9 +18,9 @@ public class LifetimeUltraCommand extends CommandBase public void Execute(Player caller, String[] args) { resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " ULTRA true")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " ULTRA")); resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales item " + args[0] + " 1 Item Mythical Chest")); } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java index 23f0d4afd..11f1ea151 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java @@ -15,7 +15,7 @@ import mineplex.staffServer.salespackage.SalesPackageManager; public class RankCommand extends CommandBase { - private static final List ACCEPTED_RANKS = Collections.unmodifiableList(Arrays.asList("player", "ultra", "hero", "legend", "titan", "eternal")); + private static final List ACCEPTED_RANKS = Collections.unmodifiableList(Arrays.asList("PLAYER", "ULTRA", "HERO", "LEGEND", "TITAN", "ETERNAL")); public RankCommand(SalesPackageManager plugin) { @@ -31,7 +31,7 @@ public class RankCommand extends CommandBase } String playerName = args[0]; - String rank = args[1]; + String rank = args[1].toUpperCase(); if (ACCEPTED_RANKS.contains(rank)) { @@ -57,4 +57,4 @@ public class RankCommand extends CommandBase }); } } -} \ No newline at end of file +} diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/DefaultRank.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/DefaultRank.java index e6c509b34..c57d90371 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/DefaultRank.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/DefaultRank.java @@ -13,7 +13,7 @@ public class DefaultRank extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales rank " + playerName + " ALL false", " Default Rank."); + addButton(agent, "/sales rank " + playerName + " PLAYER", " Default Rank."); agent.sendMessage(" "); addBackButton(agent, playerName); } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeEternal.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeEternal.java index a8148e67b..d397b654b 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeEternal.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeEternal.java @@ -13,7 +13,7 @@ public class LifetimeEternal extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales rank " + playerName + " ETERNAL true", "Lifetime Eternal."); + addButton(agent, "/sales rank " + playerName + " ETERNAL", "Lifetime Eternal."); addButton(agent, "/sales item " + playerName + " 2 Item Mythical Chest", "2 Mythical Chests."); addButton(agent, "/sales item " + playerName + " 2 Item Illuminated Chest", "2 Illuminated Chests."); addButton(agent, "/sales item " + playerName + " 1 Item Omega Chest", "1 Omega Chest."); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeHero.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeHero.java index 7b0bfcb7c..16962a754 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeHero.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeHero.java @@ -13,7 +13,7 @@ public class LifetimeHero extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales rank " + playerName + " HERO true", "Lifetime Hero."); + addButton(agent, "/sales rank " + playerName + " HERO", "Lifetime Hero."); addButton(agent, "/sales item " + playerName + " 2 Item Mythical Chest", "2 Mythical Chests."); addButton(agent, "Apply All", "/sales lifetimehero " + playerName, "Apply all above."); agent.sendMessage(" "); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeLegend.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeLegend.java index 787b73973..81572a298 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeLegend.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeLegend.java @@ -13,7 +13,7 @@ public class LifetimeLegend extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales rank " + playerName + " LEGEND true", "Lifetime Legend."); + addButton(agent, "/sales rank " + playerName + " LEGEND", "Lifetime Legend."); addButton(agent, "/sales item " + playerName + " 3 Item Mythical Chest", "3 Mythical Chests."); //addButton(agent, "/sales item " + playerName + " 1 Morph Wither Morph", "Gives Wither Morph."); //addButton(agent, "/sales item " + playerName + " 1 Pet Widder", "Gives Wither Pet."); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeTitan.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeTitan.java index cef69cde4..fbd5a159e 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeTitan.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeTitan.java @@ -13,7 +13,7 @@ public class LifetimeTitan extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales rank " + playerName + " TITAN true", "Lifetime Titan."); + addButton(agent, "/sales rank " + playerName + " TITAN", "Lifetime Titan."); addButton(agent, "/sales item " + playerName + " 5 Item Mythical Chest", "5 Mythical Chests."); // addButton(agent, "/sales item " + playerName + " 1 Molten Snake", "Gives Molten Snake Mount."); // addButton(agent, "/sales item " + playerName + " 1 Elder Guardian Morph", "Gives Elder Guardian Morph."); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeUltra.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeUltra.java index 0deb7ed75..83645f747 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeUltra.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeUltra.java @@ -13,7 +13,7 @@ public class LifetimeUltra extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales rank " + playerName + " ULTRA true", "Lifetime Ultra."); + addButton(agent, "/sales rank " + playerName + " ULTRA", "Lifetime Ultra."); addButton(agent, "/sales item " + playerName + " 1 Item Mythical Chest", "1 Mythical Chest."); addButton(agent, "Apply All", "/sales lifetimeultra " + playerName, "Apply all above."); agent.sendMessage(" ");