From b3b72f1ca0b6778813023963dddef99f5c7ac300 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 4 Apr 2016 20:40:58 +0100 Subject: [PATCH] commenting out clans bans --- .../src/mineplex/game/clans/Clans.java | 4 ++-- .../game/clans/clans/ClansManager.java | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java index 582aa5cdc..e83c185f7 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -107,7 +107,7 @@ public class Clans extends JavaPlugin Portal portal = new Portal(this, _clientManager, serverStatusManager.getCurrentServerName()); new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion()); - ClansBanManager clansBans = new ClansBanManager(this, _clientManager, _donationManager); +// ClansBanManager clansBans = new ClansBanManager(this, _clientManager, _donationManager); PacketHandler packetHandler = new PacketHandler(this); Punish punish = new Punish(this, webServerAddress, _clientManager); @@ -137,7 +137,7 @@ public class Clans extends JavaPlugin GearManager customGear = new GearManager(this, packetHandler, _clientManager, _donationManager); HologramManager hologram = new HologramManager(this, packetHandler); - _clansManager = new ClansManager(this, clansBans, serverStatusManager.getCurrentServerName(), packetHandler, punish, _clientManager, _donationManager, preferenceManager, blockRestore, statsManager, teleport, chat, customGear, hologram, webServerAddress); + _clansManager = new ClansManager(this, /*clansBans,*/ serverStatusManager.getCurrentServerName(), packetHandler, punish, _clientManager, _donationManager, preferenceManager, blockRestore, statsManager, teleport, chat, customGear, hologram, webServerAddress); new Recipes(this); new Farming(this); new BuildingShop(_clansManager, _clientManager, _donationManager); 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 7c6ba76dc..726432355 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 @@ -221,19 +221,19 @@ public class ClansManager extends MiniClientPluginimplements IRelati public String UserDataDir = UtilServer.getServer().getWorlds().get(0).getWorldFolder().getPath() + File.separator + ".." + File.separator + "CLANS_USER_DATA" + File.separator; - private ClansBanManager _clansBans; + /*private ClansBanManager _clansBans;*/ public ClanTips ClanTips; // Spawn area - public ClansManager(JavaPlugin plugin, ClansBanManager clansBans, String serverName, PacketHandler packetHandler, Punish punish, CoreClientManager clientManager, DonationManager donationManager, PreferencesManager preferencesManager, BlockRestore blockRestore, StatsManager statsManager, Teleport teleport, Chat chat, GearManager gearManager, HologramManager hologramManager, String webServerAddress) + public ClansManager(JavaPlugin plugin/*, ClansBanManager clansBans*/, String serverName, PacketHandler packetHandler, Punish punish, CoreClientManager clientManager, DonationManager donationManager, PreferencesManager preferencesManager, BlockRestore blockRestore, StatsManager statsManager, Teleport teleport, Chat chat, GearManager gearManager, HologramManager hologramManager, String webServerAddress) { super("Clans Manager", plugin); _instance = this; - _clansBans = clansBans; + /*_clansBans = clansBans;*/ _punish = punish; _serverName = serverName; @@ -598,21 +598,21 @@ public class ClansManager extends MiniClientPluginimplements IRelati { event.setJoinMessage(null); - if (_clansBans.willBeKicked(event.getPlayer())) + /*if (_clansBans.willBeKicked(event.getPlayer())) { return; - } + }*/ if (IncognitoManager.Instance.Get(event.getPlayer()).Status) { return; } - _clansBans.runAfterLoad(event.getPlayer().getName(), () -> { + /*_clansBans.runAfterLoad(event.getPlayer().getName(), () -> { if (_clansBans.Get(event.getPlayer().getName()).isBanned()) { return; - } + }*/ for (Player other : UtilServer.getPlayers()) { @@ -624,7 +624,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati other.sendMessage(F.sys("Join", event.getPlayer().getName())); } - }); + /*});*/ } @EventHandler(priority = EventPriority.HIGHEST) @@ -637,10 +637,10 @@ public class ClansManager extends MiniClientPluginimplements IRelati return; } - if (_clansBans.willBeKicked(event.getPlayer())) + /*if (_clansBans.willBeKicked(event.getPlayer())) { return; - } + }*/ for (Player other : UtilServer.getPlayers()) { @@ -663,10 +663,10 @@ public class ClansManager extends MiniClientPluginimplements IRelati return; } - if (_clansBans.willBeKicked(event.getPlayer())) + /*if (_clansBans.willBeKicked(event.getPlayer())) { return; - } + }*/ if (event.getReason().contains("You are banned from Clans")) {