From 1ee16d284db5de5bdd99fce64ca1d6fb8524583a Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Thu, 13 Nov 2014 19:14:43 -0800 Subject: [PATCH] Updated StaffServer packages to reflect enjin shop. --- .../src/mineplex/staffServer/StaffServer.java | 2 ++ .../salespackage/command/HeroCommand.java | 6 ------ .../command/LifetimeHeroCommand.java | 11 +---------- .../command/LifetimeUltraCommand.java | 11 +---------- .../salespackage/command/UltraCommand.java | 6 ------ .../salespackages/LifetimeHero.java | 5 +---- .../salespackages/LifetimeUltra.java | 5 +---- .../salespackages/MonthlyHero.java | 2 -- .../salespackages/MonthlyUltra.java | 2 -- Website/LOCWebsite.suo | Bin 474624 -> 474624 bytes 10 files changed, 6 insertions(+), 44 deletions(-) diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java index 8df18e496..2ddfe47e4 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java @@ -11,6 +11,7 @@ import mineplex.core.monitor.LagMeter; import mineplex.core.npc.NpcManager; import mineplex.core.portal.Portal; import mineplex.core.preferences.PreferencesManager; +import mineplex.core.punish.Punish; import mineplex.core.recharge.Recharge; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; @@ -45,6 +46,7 @@ public class StaffServer extends JavaPlugin DonationManager donationManager = new DonationManager(this, webServerAddress); + new Punish(this, webServerAddress, clientManager); new NpcManager(this, new Creature(this)); ServerStatusManager serverStatusManager = new ServerStatusManager(this, new LagMeter(this, clientManager)); PreferencesManager preferenceManager = new PreferencesManager(this, clientManager, donationManager); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/HeroCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/HeroCommand.java index c0de8ec3b..5d18f1224 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/HeroCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/HeroCommand.java @@ -26,11 +26,5 @@ public class HeroCommand extends CommandBase resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales booster " + args[0] + " 90")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales chest " + args[0] + " 40")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales key " + args[0] + " 10")); } } 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 08fffb258..c4e7c9b22 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeHeroCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeHeroCommand.java @@ -22,15 +22,6 @@ public class LifetimeHeroCommand extends CommandBase Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " HERO true")); resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales coin " + args[0] + " 40000")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales booster " + args[0] + " 180")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales chest " + args[0] + " 40")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales key " + args[0] + " 10")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales coin " + args[0] + " 30000")); } } 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 dbc33691d..d22d363f8 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeUltraCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/LifetimeUltraCommand.java @@ -22,15 +22,6 @@ public class LifetimeUltraCommand extends CommandBase Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales rank " + args[0] + " ULTRA true")); resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales coin " + args[0] + " 20000")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales booster " + args[0] + " 60")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales chest " + args[0] + " 20")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales key " + args[0] + " 5")); + Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales coin " + args[0] + " 15000")); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/UltraCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/UltraCommand.java index 4aa7c6fd4..996bec1b4 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/UltraCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/UltraCommand.java @@ -26,11 +26,5 @@ public class UltraCommand extends CommandBase resetCommandCharge(caller); Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales booster " + args[0] + " 30")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales chest " + args[0] + " 20")); - - resetCommandCharge(caller); - Bukkit.getServer().getPluginManager().callEvent(new PlayerCommandPreprocessEvent(caller, "/sales key " + args[0] + " 5")); } } 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 64940b81f..d1ff41360 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeHero.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeHero.java @@ -13,10 +13,7 @@ public class LifetimeHero extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales coin " + playerName + " 40000", " 40,000 Coins"); - addButton(agent, "/sales booster " + playerName + " 180", " 180 Gem Boosters"); - addButton(agent, "/sales chest " + playerName + " 40", " 40 Treasure Chests"); - addButton(agent, "/sales key " + playerName + " 10", " 10 Treasure Keys"); + addButton(agent, "/sales coin " + playerName + " 30000", " 30,000 Coins"); addButton(agent, "/sales rank " + playerName + " HERO true", " Lifetime Hero."); addButton(agent, "Apply All", "/sales lifetimehero " + playerName, " Apply all above."); agent.sendMessage(" "); 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 bca70da38..9446883ae 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeUltra.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/LifetimeUltra.java @@ -13,10 +13,7 @@ public class LifetimeUltra extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales coin " + playerName + " 20000", " 20,000 Coins"); - addButton(agent, "/sales booster " + playerName + " 60", " 60 Gem Boosters"); - addButton(agent, "/sales chest " + playerName + " 20", " 20 Treasure Chests"); - addButton(agent, "/sales key " + playerName + " 5", " 5 Treasure Keys"); + addButton(agent, "/sales coin " + playerName + " 15000", " 15,000 Coins"); addButton(agent, "/sales rank " + playerName + " ULTRA true", " Lifetime Ultra."); addButton(agent, "Apply All", "/sales lifetimeultra " + playerName, " Apply all above."); agent.sendMessage(" "); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyHero.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyHero.java index 811e0e8ec..ad82d4d83 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyHero.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyHero.java @@ -15,8 +15,6 @@ public class MonthlyHero extends SalesPackageBase { addButton(agent, "/sales coin " + playerName + " 15000", " 15,000 Coins"); addButton(agent, "/sales booster " + playerName + " 90", " 90 Gem Boosters"); - addButton(agent, "/sales chest " + playerName + " 40", " 40 Treasure Chests"); - addButton(agent, "/sales key " + playerName + " 10", " 10 Treasure Keys"); addButton(agent, "/sales rank " + playerName + " HERO false", " Monthly Hero."); addButton(agent, "Apply All", "/sales hero " + playerName, " Apply all above."); agent.sendMessage(" "); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyUltra.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyUltra.java index 7a28b1b73..ce48bbf2f 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyUltra.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/MonthlyUltra.java @@ -15,8 +15,6 @@ public class MonthlyUltra extends SalesPackageBase { addButton(agent, "/sales coin " + playerName + " 7500", " 7,500 Coins"); addButton(agent, "/sales booster " + playerName + " 30", " 30 Gem Boosters"); - addButton(agent, "/sales chest " + playerName + " 20", " 20 Treasure Chests"); - addButton(agent, "/sales key " + playerName + " 5", " 5 Treasure Keys"); addButton(agent, "/sales rank " + playerName + " ULTRA false", " Monthly Ultra."); addButton(agent, "Apply All", "/sales ultra " + playerName, " Apply all above."); agent.sendMessage(" "); diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 8bfe187473081cf482bd444e3ab2a07dfeec48ba..3db6bb26feb29f9cbda9e2f540bc9cd02bba5ddc 100644 GIT binary patch delta 13190 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 delta 13209 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