From ca19840b19cf73b6f015a33bf71eb1de072715b5 Mon Sep 17 00:00:00 2001 From: cnr Date: Thu, 22 Dec 2016 16:50:35 -0700 Subject: [PATCH] Revert "Disable communities temporarily." This reverts commit 6d5d2b551b88d37a566a2897990ebecf0cace6ff. --- .../core/communities/commands/CommunityChatCommand.java | 6 ------ .../core/communities/commands/CommunityCommand.java | 6 ------ .../core/communities/commands/CommunityCreateCommand.java | 6 ------ .../communities/commands/CommunityDescriptionCommand.java | 6 ------ .../core/communities/commands/CommunityDisbandCommand.java | 6 ------ .../core/communities/commands/CommunityInviteCommand.java | 6 ------ .../core/communities/commands/CommunityJoinCommand.java | 6 ------ .../core/communities/commands/CommunityMCSCommand.java | 6 ------ .../core/communities/commands/CommunityRenameCommand.java | 6 ------ .../core/communities/commands/CommunityUnInviteCommand.java | 6 ------ .../src/mineplex/game/clans/clans/ClansManager.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 2 +- .../src/nautilus/game/arcade/ArcadeManager.java | 2 +- 13 files changed, 3 insertions(+), 63 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityChatCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityChatCommand.java index f9c60a0cf..a1edba960 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityChatCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityChatCommand.java @@ -20,12 +20,6 @@ public class CommunityChatCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 1) { UtilPlayer.message(caller, F.help("/com chat ", "Selects which community you chat to", Rank.ALL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java index b0180dfd4..90af36ac7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java @@ -33,12 +33,6 @@ public class CommunityCommand extends MultiCommandBase @Override protected void Help(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length > 0) { if (args[0].equalsIgnoreCase("help")) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCreateCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCreateCommand.java index 892169a3b..5e01f39cb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCreateCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCreateCommand.java @@ -25,12 +25,6 @@ public class CommunityCreateCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 1) { UtilPlayer.message(caller, F.help("/com create ", "Creates a new community", Rank.ETERNAL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDescriptionCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDescriptionCommand.java index e1ccd0656..efaae74b2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDescriptionCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDescriptionCommand.java @@ -26,12 +26,6 @@ public class CommunityDescriptionCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 2) { UtilPlayer.message(caller, F.help("/com description ", "Sets the description of a community you manage", Rank.ALL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDisbandCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDisbandCommand.java index 2cef1b4ad..a70b77542 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDisbandCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityDisbandCommand.java @@ -24,12 +24,6 @@ public class CommunityDisbandCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 1) { UtilPlayer.message(caller, F.help("/com disband ", "Disbands a community you own", Rank.ETERNAL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityInviteCommand.java index 004cd7dc7..f3b6e6b65 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityInviteCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityInviteCommand.java @@ -24,12 +24,6 @@ public class CommunityInviteCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 2) { UtilPlayer.message(caller, F.help("/com invite ", "Invites a player to a community you manage", Rank.ALL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityJoinCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityJoinCommand.java index 4802dfa6d..202d73fc3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityJoinCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityJoinCommand.java @@ -21,12 +21,6 @@ public class CommunityJoinCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 1) { UtilPlayer.message(caller, F.help("/com join ", "Joins a community that is open or you have been invited to", Rank.ALL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMCSCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMCSCommand.java index 41d498a1b..1e499c57f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMCSCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMCSCommand.java @@ -25,12 +25,6 @@ public class CommunityMCSCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 1) { UtilPlayer.message(caller, F.help("/com mcs ", "Opens the Mineplex Community Server of a community you manage", Rank.ALL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityRenameCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityRenameCommand.java index b932b0a4e..bfa1863bf 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityRenameCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityRenameCommand.java @@ -27,12 +27,6 @@ public class CommunityRenameCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 2) { UtilPlayer.message(caller, F.help("/com rename ", "Changes the name of a community you own", Rank.ETERNAL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityUnInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityUnInviteCommand.java index fc2035653..99b5e9636 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityUnInviteCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityUnInviteCommand.java @@ -24,12 +24,6 @@ public class CommunityUnInviteCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (true) - { - caller.sendMessage(F.main("Communities", "Coming soon!")); - return; - } - if (args.length < 2) { UtilPlayer.message(caller, F.help("/com uninvite ", "Revokes a player's invitation to a community you manage", Rank.ALL, ChatColor.AQUA)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index c728fe4fa..3fb75c743 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -409,7 +409,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati _bannerManager.loadBanners(this); new PersonalServerManager(plugin, _clientManager).setUseInterfaceItem(false); -// new CommunityManager(plugin, _clientManager); + new CommunityManager(plugin, _clientManager); Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "Replay|Restrict"); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index fabd131ec..5b65fd27a 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -275,7 +275,7 @@ public class HubManager extends MiniClientPlugin implements IChatMess new SalesAnnouncementManager(plugin); -// new CommunityManager(plugin, _clientManager); + new CommunityManager(plugin, _clientManager); ScoreboardManager scoreboardManager = new ScoreboardManager(plugin) { 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 1f70552d3..cbc0cd184 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -407,7 +407,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation addCommand(new TauntCommand(this)); new PersonalServerManager(plugin, _clientManager).setUseInterfaceItem(false); -// new CommunityManager(plugin, _clientManager); + new CommunityManager(plugin, _clientManager); _scoreboardManager = new ScoreboardManager(_plugin) {