JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters

Browse Source
This commit is contained in:
Sam 2017-03-08 18:24:37 +00:00
commit b0b437ab4e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java
View File

@ -104,6 +104,9 @@ public class ClansHub extends JavaPlugin
ServerConfiguration serverConfiguration = new ServerConfiguration(this, clientManager); ServerConfiguration serverConfiguration = new ServerConfiguration(this, clientManager);
// Publish our server status now, to give us more time to start up
ServerStatusManager serverStatusManager = new ServerStatusManager(this, clientManager, new LagMeter(this, clientManager));
//Other Modules //Other Modules
PacketHandler packetHandler = require(PacketHandler.class); PacketHandler packetHandler = require(PacketHandler.class);
DisguiseManager disguiseManager = require(DisguiseManager.class); DisguiseManager disguiseManager = require(DisguiseManager.class);
@ -120,7 +123,6 @@ public class ClansHub extends JavaPlugin
PollManager pollManager = new PollManager(this, clientManager, donationManager); PollManager pollManager = new PollManager(this, clientManager, donationManager);
//Main Modules //Main Modules
ServerStatusManager serverStatusManager = new ServerStatusManager(this, clientManager, new LagMeter(this, clientManager));
new TitanGiveawayManager(this, clientManager, serverStatusManager); new TitanGiveawayManager(this, clientManager, serverStatusManager);
Portal portal = new Portal(); Portal portal = new Portal();

4
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
View File

@ -122,6 +122,9 @@ public class Hub extends JavaPlugin implements IRelation
ServerConfiguration serverConfiguration = new ServerConfiguration(this, clientManager); ServerConfiguration serverConfiguration = new ServerConfiguration(this, clientManager);
// Publish our server status now, to give us more time to start up
ServerStatusManager serverStatusManager = new ServerStatusManager(this, clientManager, new LagMeter(this, clientManager));
//Other Modules //Other Modules
PacketHandler packetHandler = require(PacketHandler.class); PacketHandler packetHandler = require(PacketHandler.class);
DisguiseManager disguiseManager = require(DisguiseManager.class); DisguiseManager disguiseManager = require(DisguiseManager.class);
@ -142,7 +145,6 @@ public class Hub extends JavaPlugin implements IRelation
ProjectileManager throwManager = new ProjectileManager(this); ProjectileManager throwManager = new ProjectileManager(this);
//Main Modules //Main Modules
ServerStatusManager serverStatusManager = new ServerStatusManager(this, clientManager, new LagMeter(this, clientManager));
new TitanGiveawayManager(this, clientManager, serverStatusManager); new TitanGiveawayManager(this, clientManager, serverStatusManager);
Portal portal = new Portal(); Portal portal = new Portal();

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
View File

@ -118,7 +118,10 @@ public class Arcade extends JavaPlugin
Recharge.Initialize(this); Recharge.Initialize(this);
VisibilityManager.Initialize(this); VisibilityManager.Initialize(this);
Give.Initialize(this); Give.Initialize(this);
// Publish our server status now, to give us more time to start up
ServerStatusManager serverStatusManager = new ServerStatusManager(this, _clientManager, new LagMeter(this, _clientManager));
//Velocity Fix //Velocity Fix
new VelocityFix(this); new VelocityFix(this);
@ -134,7 +137,6 @@ public class Arcade extends JavaPlugin
incognito.setPreferencesManager(preferenceManager); incognito.setPreferencesManager(preferenceManager);
Creature creature = new Creature(this); Creature creature = new Creature(this);
ServerStatusManager serverStatusManager = new ServerStatusManager(this, _clientManager, new LagMeter(this, _clientManager));
LeaderboardManager leaderboardManager = new LeaderboardManager(this, _clientManager); LeaderboardManager leaderboardManager = new LeaderboardManager(this, _clientManager);
Teleport teleport = new Teleport(this, _clientManager); Teleport teleport = new Teleport(this, _clientManager);
Portal portal = new Portal(); Portal portal = new Portal();