From 93fbe70e9cf8571bad08842a93ac49f0f0430ee8 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sun, 15 Jun 2014 17:21:40 -0700 Subject: [PATCH] Added more loggingggggg. --- .../src/mineplex/core/common/util/TimeUtil.java | 2 +- .../src/mineplex/core/account/CoreClientManager.java | 3 +++ .../nautilus/game/arcade/managers/GameCreationManager.java | 4 ++++ .../src/nautilus/game/arcade/world/WorldData.java | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/TimeUtil.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/TimeUtil.java index 50d8b198c..4340bf207 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/TimeUtil.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/TimeUtil.java @@ -30,7 +30,7 @@ public class TimeUtil { Entry entry = iterator.next(); - System.out.println(entry.getKey()+ " took " + (System.currentTimeMillis() - entry.getValue()) + "ms"); + System.out.println("==[TimeUtil]==" + entry.getKey()+ " took " + (System.currentTimeMillis() - entry.getValue()) + "ms"); iterator.remove(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java index 642a8bbfe..8760e1e7d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java @@ -188,7 +188,10 @@ public class CoreClientManager implements Listener CoreClient client = Get(event.getPlayer().getName()); if (client == null || client.GetRank() == null) + { event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "There was an error logging you in. Please reconncet."); + return; + } client.SetPlayer(event.getPlayer()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java index 371d363d9..6a267a07e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java @@ -186,9 +186,13 @@ public class GameCreationManager implements Listener return; } + TimeUtil.start("DisplayNext"); Manager.GetLobby().DisplayNext(Manager.GetGame(), pastTeams); + TimeUtil.stop(); + TimeUtil.start("registerEvents"); UtilServer.getServer().getPluginManager().registerEvents(Manager.GetGame(), Manager.GetPlugin()); + TimeUtil.stop(); } public void SetNextGameType(GameType type) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java index d82d8475d..e6de130fa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java @@ -85,8 +85,10 @@ public class WorldData World.setDifficulty(Difficulty.HARD); + TimeUtil.start("WorldData loading WorldConfig."); //Load World Data worldData.LoadWorldConfig(); + TimeUtil.stop(); } }); }