From f0e24468d5ed3493ba2eda455ed9207d97a0726c Mon Sep 17 00:00:00 2001 From: Keir Date: Sun, 22 Nov 2015 14:23:17 +0000 Subject: [PATCH] Enable reporting functionality for Arcade and Clans plugins. --- .../src/mineplex/core/report/ReportPlugin.java | 2 +- .../Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java | 6 +++++- .../src/nautilus/game/arcade/Arcade.java | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java index 0bd5e83d4..1567bc341 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java @@ -25,7 +25,7 @@ public class ReportPlugin extends MiniPlugin // purge old reports every minute // TODO does this need to be async? _reportPurgeTask = new ReportPurgeTask(_reportManager); - _reportPurgeTask.runTaskTimer(getPlugin(), 20L * 10, 20L *60); + _reportPurgeTask.runTaskTimer(getPlugin(), 20L * 10, 20L * 60); } @Override 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 ac3c3dc40..68d4a38e0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -22,6 +22,8 @@ import mineplex.core.portal.Portal; import mineplex.core.preferences.PreferencesManager; import mineplex.core.punish.Punish; import mineplex.core.recharge.Recharge; +import mineplex.core.report.ReportManager; +import mineplex.core.report.ReportPlugin; import mineplex.core.serverConfig.ServerConfiguration; import mineplex.core.spawn.Spawn; import mineplex.core.stats.StatsManager; @@ -81,13 +83,15 @@ public class Clans extends JavaPlugin BlockRestore blockRestore = new BlockRestore(this); IgnoreManager ignoreManager = new IgnoreManager(this, _clientManager, preferenceManager, portal); - Chat chat = new Chat(this, _clientManager, preferenceManager, new AchievementManager(new StatsManager(this, _clientManager), _clientManager, _donationManager), serverStatusManager.getCurrentServerName()); + StatsManager statsManager = new StatsManager(this, _clientManager); + Chat chat = new Chat(this, _clientManager, preferenceManager, new AchievementManager(statsManager, _clientManager, _donationManager), serverStatusManager.getCurrentServerName()); new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, new FriendManager(this, _clientManager, preferenceManager, portal), chat); new MemoryFix(this); new Explosion(this, blockRestore); new FriendManager(this, _clientManager, preferenceManager, portal); new InventoryManager(this, _clientManager); + new ReportPlugin(this, new ReportManager(this, preferenceManager, statsManager, serverStatusManager.getCurrentServerName())); ClansManager clans = new ClansManager(this, serverStatusManager.getCurrentServerName(), _clientManager, _donationManager, blockRestore, teleport, webServerAddress); new Recipes(this); 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 28aa540dc..3edb66383 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -48,6 +48,8 @@ import mineplex.core.preferences.PreferencesManager; import mineplex.core.projectile.ProjectileManager; import mineplex.core.punish.Punish; import mineplex.core.recharge.Recharge; +import mineplex.core.report.ReportManager; +import mineplex.core.report.ReportPlugin; import mineplex.core.serverConfig.ServerConfiguration; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; @@ -132,7 +134,8 @@ public class Arcade extends JavaPlugin FriendManager friendManager = new FriendManager(this, _clientManager, preferenceManager, portal); Chat chat = new Chat(this, _clientManager, preferenceManager, achievementManager, serverStatusManager.getCurrentServerName()); new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, friendManager, chat); - + new ReportPlugin(this, new ReportManager(this, preferenceManager, statsManager, serverStatusManager.getCurrentServerName())); + BlockRestore blockRestore = new BlockRestore(this); ProjectileManager projectileManager = new ProjectileManager(this);