From 0f7c52391f1c40161418ee4c3a5d809c1b53b61c Mon Sep 17 00:00:00 2001 From: William Burns Date: Tue, 17 Nov 2015 08:19:36 +0000 Subject: [PATCH 01/10] Global Packet work. Added giveitem sub-command. --- .../globalpacket/GlobalPacketManager.java | 8 +- .../command/GlobalPacketCommand.java | 6 +- .../listeners/GlobalGiveItem.java | 117 ++++++++++++++++++ .../mineplex/core/message/MessageManager.java | 2 +- .../core/message/commands/GlobalCommand.java | 32 ----- .../src/nautilus/game/arcade/Arcade.java | 2 +- 6 files changed, 129 insertions(+), 38 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java delete mode 100644 Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java index 1329e1045..972aebc5f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java @@ -12,8 +12,10 @@ import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.globalpacket.command.GlobalPacketCommand; +import mineplex.core.globalpacket.listeners.GlobalGiveItem; import mineplex.core.globalpacket.redis.GlobalPacketHandler; import mineplex.core.globalpacket.redis.GlobalPacketMessage; +import mineplex.core.inventory.InventoryManager; import mineplex.core.status.ServerStatusManager; import mineplex.serverdata.commands.ServerCommandManager; @@ -21,15 +23,19 @@ public class GlobalPacketManager extends MiniPlugin { private CoreClientManager _clientManager; private ServerStatusManager _statusManager; + private InventoryManager _inventoryManager; - public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager) + public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, InventoryManager inventoryManager) { super("Global Packet Manager", plugin); _clientManager = clientManager; _statusManager = statusManager; + _inventoryManager = inventoryManager; ServerCommandManager.getInstance().registerCommandType("GlobalPacketMessage", GlobalPacketMessage.class, new GlobalPacketHandler(statusManager)); + + getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager), getPlugin()); } public void callGlobalCommand(Player caller, String[] args) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java index d30163fe7..994262900 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java @@ -12,7 +12,7 @@ public class GlobalPacketCommand extends CommandBase { public GlobalPacketCommand(GlobalPacketManager plugin) { - super(plugin, Rank.ADMIN, "globalpacket"); + super(plugin, Rank.JNR_DEV, "global", "globalpacket"); } @Override @@ -20,8 +20,8 @@ public class GlobalPacketCommand extends CommandBase { if (args == null || args.length < 1) { - UtilPlayer.message(caller, F.main("Global", "Please call the globalpacket command with at least 1 argument")); - UtilPlayer.message(caller, F.main("Global", "For help please see /globalpacket google doc")); + UtilPlayer.message(caller, F.main("Global", "Please call the global command with at least 1 argument")); + UtilPlayer.message(caller, F.main("Global", "For help please see /global google doc")); return; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java new file mode 100644 index 000000000..98465fbed --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java @@ -0,0 +1,117 @@ +package mineplex.core.globalpacket.listeners; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +import mineplex.core.common.util.C; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.globalpacket.event.GlobalPacketEvent; +import mineplex.core.inventory.InventoryManager; + +/** + * Created by William (WilliamTiger). + * 17/11/15 + */ +public class GlobalGiveItem implements Listener +{ + + private InventoryManager _inventoryManager; + + public GlobalGiveItem(InventoryManager inventoryManager) + { + _inventoryManager = inventoryManager; + } + + public enum GlobalItem + { + OLD_CHEST("Old Chest"), + ANCIENT_CHEST("Ancient Chest"), + MYTHICAL_CHEST("Mythical Chest"); + + private String _invName; + + GlobalItem(String invName) + { + _invName = invName; + } + + public String getInvName() + { + return _invName; + } + } + + @EventHandler + public void giveItem(GlobalPacketEvent e) + { + if (e.getParts() == null || e.getParts().length < 1) + return; + + if (!e.getParts()[0].equalsIgnoreCase("giveitem")) + return; + + GlobalItem item = null; + + try + { + item = GlobalItem.valueOf(e.getParts()[1]); + } + catch (Exception ex) + { + // Wrong item + + if (e.getCaller().isOnline()) + { + UtilPlayer.message(e.getCaller(), F.main("Global", "That GlobalItem type can't be found. Types:")); + + String list = ""; + for (GlobalItem i : GlobalItem.values()) + list += i.toString() + " "; + + UtilPlayer.message(e.getCaller(), C.cYellow + list); + } + + return; + } + + int amount = 1; // Default, shouldn't happen anyway. + + try + { + amount = Integer.parseInt(e.getParts()[2]); + } + catch (Exception ex) + { + // Not a number + + if (e.getCaller().isOnline()) + UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(e.getParts()[2]) + "] is not a valid number.")); + + return; + } + + if (item.toString().contains("CHEST")) + { + for (final Player p : UtilServer.getPlayers()) + { + final int fAmount = amount; + final GlobalItem fItem = item; + _inventoryManager.addItemToInventory(new Callback() + { + @Override + public void run(Boolean data) + { + UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " " + fItem.getInvName() + "(s)") + " from " + F.name(p.getName()) + ".")); + UtilTextMiddle.display(C.cGold + p.getName() + " gave everyone", C.cYellow + fAmount + " " + fItem.getInvName() + "(s)!", p); + } + }, p, item.getInvName(), amount); + } + } + } + +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java index 003e0878c..0936a669e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java @@ -83,7 +83,7 @@ public class MessageManager extends MiniClientPlugin addCommand(new ResendAdminCommand(this)); addCommand(new AnnounceCommand(this)); - addCommand(new GlobalCommand(this)); + //addCommand(new GlobalCommand(this)); addCommand(new AdminCommand(this)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java deleted file mode 100644 index 9c9f12e62..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java +++ /dev/null @@ -1,32 +0,0 @@ -package mineplex.core.message.commands; - -import mineplex.core.command.CommandBase; -import mineplex.core.common.Rank; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.message.MessageManager; -import mineplex.serverdata.commands.AnnouncementCommand; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - -public class GlobalCommand extends CommandBase -{ - public GlobalCommand(MessageManager plugin) - { - super(plugin, Rank.ADMIN, "global"); - } - - @Override - public void Execute(Player caller, String[] args) - { - if (args == null || args.length == 0) - { - Plugin.Help(caller); - } - else - { - new AnnouncementCommand(false, F.combine(args, 0, null, false)).publish(); - } - } -} 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 0c60a3745..6fc0676f6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -147,7 +147,7 @@ public class Arcade extends JavaPlugin cosmeticManager.setInterfaceSlot(7); cosmeticManager.disableTeamArmor(); - new GlobalPacketManager(this, _clientManager, serverStatusManager); + new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager); GiveawayManager giveawayManager = new GiveawayManager(this, _clientManager, serverStatusManager); From a28adc9673a9f3019a64049e547938fc89483852 Mon Sep 17 00:00:00 2001 From: William Burns Date: Tue, 17 Nov 2015 18:26:19 +0000 Subject: [PATCH 02/10] More global stuff! Added GlobalGiveGems. --- .../globalpacket/GlobalPacketManager.java | 7 +- .../globalpacket/event/GlobalGiveGems.java | 74 +++++++++++++++++++ .../listeners/GlobalGiveItem.java | 8 ++ .../src/nautilus/game/arcade/Arcade.java | 2 +- 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java index 972aebc5f..79d4163d8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java @@ -11,7 +11,9 @@ import mineplex.core.account.CoreClientManager; import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; +import mineplex.core.donation.DonationManager; import mineplex.core.globalpacket.command.GlobalPacketCommand; +import mineplex.core.globalpacket.event.GlobalGiveGems; import mineplex.core.globalpacket.listeners.GlobalGiveItem; import mineplex.core.globalpacket.redis.GlobalPacketHandler; import mineplex.core.globalpacket.redis.GlobalPacketMessage; @@ -24,18 +26,21 @@ public class GlobalPacketManager extends MiniPlugin private CoreClientManager _clientManager; private ServerStatusManager _statusManager; private InventoryManager _inventoryManager; + private DonationManager _donationManager; - public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, InventoryManager inventoryManager) + public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, InventoryManager inventoryManager, DonationManager donationManager) { super("Global Packet Manager", plugin); _clientManager = clientManager; _statusManager = statusManager; _inventoryManager = inventoryManager; + _donationManager = donationManager; ServerCommandManager.getInstance().registerCommandType("GlobalPacketMessage", GlobalPacketMessage.class, new GlobalPacketHandler(statusManager)); getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager), getPlugin()); + getPluginManager().registerEvents(new GlobalGiveGems(donationManager), getPlugin()); } public void callGlobalCommand(Player caller, String[] args) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java new file mode 100644 index 000000000..9a6b7aa65 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java @@ -0,0 +1,74 @@ +package mineplex.core.globalpacket.event; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +import mineplex.core.common.util.C; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.donation.DonationManager; + +/** + * Created by William (WilliamTiger). + * 17/11/15 + */ +public class GlobalGiveGems implements Listener +{ + + private DonationManager _donationManager; + + public GlobalGiveGems(DonationManager donationManager) + { + _donationManager = donationManager; + } + + @EventHandler + public void giveGems(GlobalPacketEvent e) + { + if (e.getParts() == null || e.getParts().length < 1) + return; + + if (!e.getParts()[0].equalsIgnoreCase("givegems")) + return; + + if (e.getParts().length != 2) + { + if (e.getCaller().isOnline()) + UtilPlayer.message(e.getCaller(), F.main("Global", "/global givegems ")); + + return; + } + + int amount = 1; + try + { + amount = Integer.parseInt(e.getParts()[1]); + } + catch (Exception ex) + { + // No number + if (e.getCaller().isOnline()) + UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(amount + "") + "] is not a valid amount.")); + + return; + } + + final int fAmount = amount; + for (final Player p : UtilServer.getPlayers()) + { + _donationManager.RewardGems(new Callback() + { + @Override + public void run(Boolean data) + { + UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Gems") + ".")); + UtilTextMiddle.display(C.cGold + p.getName() + " gave everyone", C.cYellow + fAmount + " Gems" + "!", p); + } + }, "Global Gems", p.getName(), p.getUniqueId(), amount); + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java index 98465fbed..d00fe5654 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java @@ -55,6 +55,14 @@ public class GlobalGiveItem implements Listener if (!e.getParts()[0].equalsIgnoreCase("giveitem")) return; + if (e.getParts().length != 3) + { + if (e.getCaller().isOnline()) + UtilPlayer.message(e.getCaller(), F.main("Global", "/global giveitem ")); + + return; + } + GlobalItem item = null; try 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 6fc0676f6..c52cbe441 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -147,7 +147,7 @@ public class Arcade extends JavaPlugin cosmeticManager.setInterfaceSlot(7); cosmeticManager.disableTeamArmor(); - new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager); + new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager, _donationManager); GiveawayManager giveawayManager = new GiveawayManager(this, _clientManager, serverStatusManager); From e19d4e11e1c40698a440dfa14b65c96e644b23aa Mon Sep 17 00:00:00 2001 From: William Burns Date: Tue, 17 Nov 2015 18:54:39 +0000 Subject: [PATCH 03/10] Added GlobalGiveCoins. Changes Gems a little and the manager. --- .../globalpacket/GlobalPacketManager.java | 4 +- .../listeners/GlobalGiveCoins.java | 78 +++++++++++++++++++ .../{event => listeners}/GlobalGiveGems.java | 3 +- 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java rename Plugins/Mineplex.Core/src/mineplex/core/globalpacket/{event => listeners}/GlobalGiveGems.java (94%) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java index 79d4163d8..d87671f22 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java @@ -13,7 +13,8 @@ import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.donation.DonationManager; import mineplex.core.globalpacket.command.GlobalPacketCommand; -import mineplex.core.globalpacket.event.GlobalGiveGems; +import mineplex.core.globalpacket.listeners.GlobalGiveCoins; +import mineplex.core.globalpacket.listeners.GlobalGiveGems; import mineplex.core.globalpacket.listeners.GlobalGiveItem; import mineplex.core.globalpacket.redis.GlobalPacketHandler; import mineplex.core.globalpacket.redis.GlobalPacketMessage; @@ -41,6 +42,7 @@ public class GlobalPacketManager extends MiniPlugin getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager), getPlugin()); getPluginManager().registerEvents(new GlobalGiveGems(donationManager), getPlugin()); + getPluginManager().registerEvents(new GlobalGiveCoins(donationManager, clientManager), getPlugin()); } public void callGlobalCommand(Player caller, String[] args) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java new file mode 100644 index 000000000..13486757d --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java @@ -0,0 +1,78 @@ +package mineplex.core.globalpacket.listeners; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +import mineplex.core.account.CoreClientManager; +import mineplex.core.common.util.C; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.donation.DonationManager; +import mineplex.core.globalpacket.event.GlobalPacketEvent; + +/** + * Created by William (WilliamTiger). + * 17/11/15 + */ +public class GlobalGiveCoins implements Listener +{ + + private DonationManager _donationManager; + private CoreClientManager _clientManager; + + public GlobalGiveCoins(DonationManager donationManager, CoreClientManager coreClientManager) + { + _donationManager = donationManager; + _clientManager = coreClientManager; + } + + @EventHandler + public void giveCoins(GlobalPacketEvent e) + { + if (e.getParts() == null || e.getParts().length < 1) + return; + + if (!e.getParts()[0].equalsIgnoreCase("givecoins")) + return; + + if (e.getParts().length != 2) + { + if (e.getCaller().isOnline()) + UtilPlayer.message(e.getCaller(), F.main("Global", "/global givecoins ")); + + return; + } + + int amount = 1; + try + { + amount = Integer.parseInt(e.getParts()[1]); + } + catch (Exception ex) + { + // No number + if (e.getCaller().isOnline()) + UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(amount + "") + "] is not a valid amount.")); + + return; + } + + final int fAmount = amount; + for (final Player p : UtilServer.getPlayers()) + { + _donationManager.RewardCoins(new Callback() + { + @Override + public void run(Boolean data) + { + UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Coins") + ".")); + UtilTextMiddle.display(C.cGold + p.getName() + " gave everyone", C.cYellow + fAmount + " Coins" + "!", p); + } + }, "Global Coins", p.getName(), _clientManager.getAccountId(p), amount); + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java similarity index 94% rename from Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java rename to Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java index 9a6b7aa65..618636f84 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/event/GlobalGiveGems.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java @@ -1,4 +1,4 @@ -package mineplex.core.globalpacket.event; +package mineplex.core.globalpacket.listeners; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -11,6 +11,7 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; import mineplex.core.donation.DonationManager; +import mineplex.core.globalpacket.event.GlobalPacketEvent; /** * Created by William (WilliamTiger). From e83b49d490311a58093bb9e7e64195f0987ab75f Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 13:43:22 +0000 Subject: [PATCH 04/10] Reformatting titles --- .../mineplex/core/globalpacket/listeners/GlobalGiveCoins.java | 2 +- .../mineplex/core/globalpacket/listeners/GlobalGiveGems.java | 2 +- .../mineplex/core/globalpacket/listeners/GlobalGiveItem.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java index 13486757d..0e20c0850 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java @@ -70,7 +70,7 @@ public class GlobalGiveCoins implements Listener public void run(Boolean data) { UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Coins") + ".")); - UtilTextMiddle.display(C.cGold + p.getName() + " gave everyone", C.cYellow + fAmount + " Coins" + "!", p); + UtilTextMiddle.display(C.cYellow + fAmount + " Coins", C.cGold + "received from " + p.getName() + "!", p); } }, "Global Coins", p.getName(), _clientManager.getAccountId(p), amount); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java index 618636f84..11ec36b43 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java @@ -67,7 +67,7 @@ public class GlobalGiveGems implements Listener public void run(Boolean data) { UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Gems") + ".")); - UtilTextMiddle.display(C.cGold + p.getName() + " gave everyone", C.cYellow + fAmount + " Gems" + "!", p); + UtilTextMiddle.display(C.cYellow + fAmount + " Gems", C.cGold + "received from " + p.getName() + "!", p); } }, "Global Gems", p.getName(), p.getUniqueId(), amount); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java index d00fe5654..663d6f8cf 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java @@ -115,7 +115,7 @@ public class GlobalGiveItem implements Listener public void run(Boolean data) { UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " " + fItem.getInvName() + "(s)") + " from " + F.name(p.getName()) + ".")); - UtilTextMiddle.display(C.cGold + p.getName() + " gave everyone", C.cYellow + fAmount + " " + fItem.getInvName() + "(s)!", p); + UtilTextMiddle.display(C.cYellow + fAmount + " " + fItem.getInvName() + "(s)", C.cGold + "received from " + p.getName() + "!", p); } }, p, item.getInvName(), amount); } From e16ee9036a053d387aefb3277671e01eb74ecd71 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 14:35:40 +0000 Subject: [PATCH 05/10] Added the ability to give out game loot. --- .../globalpacket/GlobalPacketManager.java | 16 +++++++-- .../listeners/GlobalGiveItem.java | 33 +++++++++++++++++-- .../src/nautilus/game/arcade/Arcade.java | 4 +-- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java index d87671f22..0c87a53dd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java @@ -12,6 +12,7 @@ import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.donation.DonationManager; +import mineplex.core.giveaway.GiveawayManager; import mineplex.core.globalpacket.command.GlobalPacketCommand; import mineplex.core.globalpacket.listeners.GlobalGiveCoins; import mineplex.core.globalpacket.listeners.GlobalGiveGems; @@ -19,6 +20,9 @@ import mineplex.core.globalpacket.listeners.GlobalGiveItem; import mineplex.core.globalpacket.redis.GlobalPacketHandler; import mineplex.core.globalpacket.redis.GlobalPacketMessage; import mineplex.core.inventory.InventoryManager; +import mineplex.core.pet.PetManager; +import mineplex.core.reward.RewardManager; +import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.serverdata.commands.ServerCommandManager; @@ -28,8 +32,9 @@ public class GlobalPacketManager extends MiniPlugin private ServerStatusManager _statusManager; private InventoryManager _inventoryManager; private DonationManager _donationManager; + private RewardManager _rewardManager; - public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, InventoryManager inventoryManager, DonationManager donationManager) + public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, InventoryManager inventoryManager, DonationManager donationManager, PetManager petManager, StatsManager statsManager, GiveawayManager giveawayManager) { super("Global Packet Manager", plugin); @@ -38,9 +43,16 @@ public class GlobalPacketManager extends MiniPlugin _inventoryManager = inventoryManager; _donationManager = donationManager; + _rewardManager = new RewardManager(clientManager, statusManager, donationManager, inventoryManager, petManager, statsManager, giveawayManager, + 100, 250, + 500, 1000, + 1500, 2500, + 6000, 12000, + false, false); + ServerCommandManager.getInstance().registerCommandType("GlobalPacketMessage", GlobalPacketMessage.class, new GlobalPacketHandler(statusManager)); - getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager), getPlugin()); + getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager, _rewardManager), getPlugin()); getPluginManager().registerEvents(new GlobalGiveGems(donationManager), getPlugin()); getPluginManager().registerEvents(new GlobalGiveCoins(donationManager, clientManager), getPlugin()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java index 663d6f8cf..076a099e6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java @@ -12,6 +12,10 @@ import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; import mineplex.core.globalpacket.event.GlobalPacketEvent; import mineplex.core.inventory.InventoryManager; +import mineplex.core.reward.Reward; +import mineplex.core.reward.RewardData; +import mineplex.core.reward.RewardManager; +import mineplex.core.reward.RewardType; /** * Created by William (WilliamTiger). @@ -21,17 +25,21 @@ public class GlobalGiveItem implements Listener { private InventoryManager _inventoryManager; + private RewardManager _rewardManager; - public GlobalGiveItem(InventoryManager inventoryManager) + public GlobalGiveItem(InventoryManager inventoryManager, RewardManager rewardManager) { _inventoryManager = inventoryManager; + _rewardManager = rewardManager; } public enum GlobalItem { OLD_CHEST("Old Chest"), ANCIENT_CHEST("Ancient Chest"), - MYTHICAL_CHEST("Mythical Chest"); + MYTHICAL_CHEST("Mythical Chest"), + + GAME_LOOT("Game Loot"); private String _invName; @@ -47,7 +55,7 @@ public class GlobalGiveItem implements Listener } @EventHandler - public void giveItem(GlobalPacketEvent e) + public void giveItem(final GlobalPacketEvent e) { if (e.getParts() == null || e.getParts().length < 1) return; @@ -119,6 +127,25 @@ public class GlobalGiveItem implements Listener } }, p, item.getInvName(), amount); } + + return; + } + else if (item.toString().equalsIgnoreCase("GAME_LOOT")) + { + for (final Player p : UtilServer.getPlayers()) + { + Reward reward = _rewardManager.nextReward(p, null, false, RewardType.GameLoot, true); + reward.giveReward(RewardType.GameLoot, p, new Callback() + { + @Override + public void run(RewardData data) + { + UtilPlayer.message(p, F.main("Global", "You received " + F.elem("Game Loot") + " from " + F.name(e.getCaller().getName()) + ".")); + UtilPlayer.message(p, F.main("Global", "You won " + F.elem(data.getFriendlyName()) + "!")); + UtilTextMiddle.display(C.cYellow + data.getFriendlyName(), C.cGold + "received from " + e.getCaller().getName() + "!", p); + } + }); + } } } 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 c52cbe441..28aa540dc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -147,9 +147,9 @@ public class Arcade extends JavaPlugin cosmeticManager.setInterfaceSlot(7); cosmeticManager.disableTeamArmor(); - new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager, _donationManager); - GiveawayManager giveawayManager = new GiveawayManager(this, _clientManager, serverStatusManager); + + new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager, _donationManager, petManager, statsManager, giveawayManager); //Arcade Manager PollManager pollManager = new PollManager(this, _clientManager, _donationManager); From 2e223d0660822d035f53ef36bc84c725a6915ac4 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 15:42:33 +0000 Subject: [PATCH 06/10] rawr and fixes --- .../globalpacket/GlobalPacketManager.java | 2 + .../listeners/GlobalGiveCoins.java | 8 +-- .../listeners/GlobalGiveGems.java | 8 +-- .../listeners/GlobalGiveItem.java | 14 +++--- .../globalpacket/listeners/GlobalRawr.java | 50 +++++++++++++++++++ 5 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java index 0c87a53dd..97257bd98 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java @@ -17,6 +17,7 @@ import mineplex.core.globalpacket.command.GlobalPacketCommand; import mineplex.core.globalpacket.listeners.GlobalGiveCoins; import mineplex.core.globalpacket.listeners.GlobalGiveGems; import mineplex.core.globalpacket.listeners.GlobalGiveItem; +import mineplex.core.globalpacket.listeners.GlobalRawr; import mineplex.core.globalpacket.redis.GlobalPacketHandler; import mineplex.core.globalpacket.redis.GlobalPacketMessage; import mineplex.core.inventory.InventoryManager; @@ -55,6 +56,7 @@ public class GlobalPacketManager extends MiniPlugin getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager, _rewardManager), getPlugin()); getPluginManager().registerEvents(new GlobalGiveGems(donationManager), getPlugin()); getPluginManager().registerEvents(new GlobalGiveCoins(donationManager, clientManager), getPlugin()); + getPluginManager().registerEvents(new GlobalRawr(), getPlugin()); } public void callGlobalCommand(Player caller, String[] args) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java index 0e20c0850..be32efbc2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java @@ -31,7 +31,7 @@ public class GlobalGiveCoins implements Listener } @EventHandler - public void giveCoins(GlobalPacketEvent e) + public void giveCoins(final GlobalPacketEvent e) { if (e.getParts() == null || e.getParts().length < 1) return; @@ -41,7 +41,7 @@ public class GlobalGiveCoins implements Listener if (e.getParts().length != 2) { - if (e.getCaller().isOnline()) + if (e.getCaller() != null) UtilPlayer.message(e.getCaller(), F.main("Global", "/global givecoins ")); return; @@ -55,7 +55,7 @@ public class GlobalGiveCoins implements Listener catch (Exception ex) { // No number - if (e.getCaller().isOnline()) + if (e.getCaller() != null) UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(amount + "") + "] is not a valid amount.")); return; @@ -70,7 +70,7 @@ public class GlobalGiveCoins implements Listener public void run(Boolean data) { UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Coins") + ".")); - UtilTextMiddle.display(C.cYellow + fAmount + " Coins", C.cGold + "received from " + p.getName() + "!", p); + UtilTextMiddle.display(C.cYellow + fAmount + " Coins", C.cGold + "received from " + e.getCallerName() + "!", p); } }, "Global Coins", p.getName(), _clientManager.getAccountId(p), amount); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java index 11ec36b43..477505ceb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java @@ -28,7 +28,7 @@ public class GlobalGiveGems implements Listener } @EventHandler - public void giveGems(GlobalPacketEvent e) + public void giveGems(final GlobalPacketEvent e) { if (e.getParts() == null || e.getParts().length < 1) return; @@ -38,7 +38,7 @@ public class GlobalGiveGems implements Listener if (e.getParts().length != 2) { - if (e.getCaller().isOnline()) + if (e.getCaller() != null) UtilPlayer.message(e.getCaller(), F.main("Global", "/global givegems ")); return; @@ -52,7 +52,7 @@ public class GlobalGiveGems implements Listener catch (Exception ex) { // No number - if (e.getCaller().isOnline()) + if (e.getCaller() != null) UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(amount + "") + "] is not a valid amount.")); return; @@ -67,7 +67,7 @@ public class GlobalGiveGems implements Listener public void run(Boolean data) { UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Gems") + ".")); - UtilTextMiddle.display(C.cYellow + fAmount + " Gems", C.cGold + "received from " + p.getName() + "!", p); + UtilTextMiddle.display(C.cYellow + fAmount + " Gems", C.cGold + "received from " + e.getCallerName() + "!", p); } }, "Global Gems", p.getName(), p.getUniqueId(), amount); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java index 076a099e6..28e76c4b5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java @@ -65,7 +65,7 @@ public class GlobalGiveItem implements Listener if (e.getParts().length != 3) { - if (e.getCaller().isOnline()) + if (e.getCaller() != null) UtilPlayer.message(e.getCaller(), F.main("Global", "/global giveitem ")); return; @@ -81,7 +81,7 @@ public class GlobalGiveItem implements Listener { // Wrong item - if (e.getCaller().isOnline()) + if (e.getCaller() != null) { UtilPlayer.message(e.getCaller(), F.main("Global", "That GlobalItem type can't be found. Types:")); @@ -105,7 +105,7 @@ public class GlobalGiveItem implements Listener { // Not a number - if (e.getCaller().isOnline()) + if (e.getCaller() != null) UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(e.getParts()[2]) + "] is not a valid number.")); return; @@ -122,8 +122,8 @@ public class GlobalGiveItem implements Listener @Override public void run(Boolean data) { - UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " " + fItem.getInvName() + "(s)") + " from " + F.name(p.getName()) + ".")); - UtilTextMiddle.display(C.cYellow + fAmount + " " + fItem.getInvName() + "(s)", C.cGold + "received from " + p.getName() + "!", p); + UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " " + fItem.getInvName() + "(s)") + " from " + F.name(e.getCallerName()) + ".")); + UtilTextMiddle.display(C.cYellow + fAmount + " " + fItem.getInvName() + "(s)", C.cGold + "received from " + e.getCallerName() + "!", p); } }, p, item.getInvName(), amount); } @@ -140,9 +140,9 @@ public class GlobalGiveItem implements Listener @Override public void run(RewardData data) { - UtilPlayer.message(p, F.main("Global", "You received " + F.elem("Game Loot") + " from " + F.name(e.getCaller().getName()) + ".")); + UtilPlayer.message(p, F.main("Global", "You received " + F.elem("Game Loot") + " from " + F.name(e.getCallerName()) + ".")); UtilPlayer.message(p, F.main("Global", "You won " + F.elem(data.getFriendlyName()) + "!")); - UtilTextMiddle.display(C.cYellow + data.getFriendlyName(), C.cGold + "received from " + e.getCaller().getName() + "!", p); + UtilTextMiddle.display(C.cYellow + data.getFriendlyName(), C.cGold + "received from " + e.getCallerName() + "!", p); } }); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java new file mode 100644 index 000000000..fa177e6fa --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java @@ -0,0 +1,50 @@ +package mineplex.core.globalpacket.listeners; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.globalpacket.event.GlobalPacketEvent; + +/** + * Created by William (WilliamTiger). + * 18/11/15 + */ +public class GlobalRawr implements Listener +{ + + @EventHandler + public void globalRawr(GlobalPacketEvent e) + { + if (e.getParts() == null || e.getParts().length < 1) + return; + + if (!e.getParts()[0].equalsIgnoreCase("rawr")) + return; + + if (e.getParts().length < 2) + { + if (e.getCaller() != null) + UtilPlayer.message(e.getCaller(), F.main("Global", "/global rawr ")); + + return; + } + + String msg = ""; + for (String cur : e.getParts()) + { + msg += cur + " "; + } + msg = msg.trim(); + + for (Player p : UtilServer.getPlayers()) + { + UtilTextMiddle.display("§6§lRAWR!", "§e" + msg, p); + } + } + +} From 04a4b072afdd01e26d806e8b462f9e453717cdc6 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 15:48:25 +0000 Subject: [PATCH 07/10] woops easy fix --- .../src/mineplex/core/globalpacket/listeners/GlobalRawr.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java index fa177e6fa..ffba8fb83 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java @@ -35,9 +35,9 @@ public class GlobalRawr implements Listener } String msg = ""; - for (String cur : e.getParts()) + for (int i = 1; i < e.getParts().length; i++) { - msg += cur + " "; + msg += e.getParts()[i] + " "; } msg = msg.trim(); From a11ca138e764417c23a0060dd134ef7c49741295 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 16:01:53 +0000 Subject: [PATCH 08/10] ranks --- .../mineplex/core/globalpacket/listeners/GlobalGiveCoins.java | 4 ++++ .../mineplex/core/globalpacket/listeners/GlobalGiveGems.java | 4 ++++ .../mineplex/core/globalpacket/listeners/GlobalGiveItem.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java index be32efbc2..f264b2457 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java @@ -5,6 +5,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import mineplex.core.account.CoreClientManager; +import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; @@ -33,6 +34,9 @@ public class GlobalGiveCoins implements Listener @EventHandler public void giveCoins(final GlobalPacketEvent e) { + if (!e.getCallerRank().has(Rank.ADMIN)) + return; + if (e.getParts() == null || e.getParts().length < 1) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java index 477505ceb..f7763b839 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java @@ -4,6 +4,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; @@ -30,6 +31,9 @@ public class GlobalGiveGems implements Listener @EventHandler public void giveGems(final GlobalPacketEvent e) { + if (!e.getCallerRank().has(Rank.ADMIN)) + return; + if (e.getParts() == null || e.getParts().length < 1) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java index 28e76c4b5..1420cac3e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java @@ -4,6 +4,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; @@ -57,6 +58,9 @@ public class GlobalGiveItem implements Listener @EventHandler public void giveItem(final GlobalPacketEvent e) { + if (!e.getCallerRank().has(Rank.ADMIN)) + return; + if (e.getParts() == null || e.getParts().length < 1) return; From 0e1c72e25d4d490d768ea228f5a325550bd60786 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 18:46:51 +0000 Subject: [PATCH 09/10] testing excludes --- .../src/mineplex/core/globalpacket/listeners/GlobalRawr.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java index ffba8fb83..066530e52 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java @@ -34,7 +34,7 @@ public class GlobalRawr implements Listener return; } - String msg = ""; + String msg = ""; //test for (int i = 1; i < e.getParts().length; i++) { msg += e.getParts()[i] + " "; From 4620a5a1626aaefb992ff62a14dc35ed9ae60a86 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 18 Nov 2015 21:47:52 +0000 Subject: [PATCH 10/10] Hub fix --- .../src/mineplex/core/globalpacket/listeners/GlobalRawr.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java index 066530e52..ffba8fb83 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java @@ -34,7 +34,7 @@ public class GlobalRawr implements Listener return; } - String msg = ""; //test + String msg = ""; for (int i = 1; i < e.getParts().length; i++) { msg += e.getParts()[i] + " "; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index 864300244..31364b88f 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -149,7 +149,7 @@ public class Hub extends JavaPlugin implements IRelation return true; } }); - new GlobalPacketManager(this, clientManager, serverStatusManager); + new GlobalPacketManager(this, clientManager, serverStatusManager, inventoryManager, donationManager, petManager, statsManager, giveawayManager); //new Replay(this, packetHandler); AprilFoolsManager.Initialize(this, clientManager, disguiseManager);