From 128e16cbcdd95926c38755303dbd15c9959e0c85 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Sat, 23 Sep 2017 00:11:47 -0400 Subject: [PATCH] Add missing safe log qualifications --- .../game/clans/gameplay/safelog/SafeLog.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java index 350e6228c..48539f17e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java @@ -71,6 +71,11 @@ public class SafeLog extends MiniPlugin isSafeLog = true; } + if (Managers.get(ClansFreezeManager.class).isPanicking(player)) + { + isSafeLog = true; + } + if (Managers.get(RestartManager.class).isRestarting()) { isSafeLog = true; @@ -81,12 +86,19 @@ public class SafeLog extends MiniPlugin isSafeLog = true; } + if (_clansManager.hasTimer(player)) + { + isSafeLog = true; + } + + if (_clansManager.getIncognitoManager().Get(player).Status) + { + isSafeLog = true; + } + if (!isSafeLog) { - if (!_clansManager.getIncognitoManager().Get(player).Status) - { - NPCManager.getInstance().spawnLogoutNpc(player); - } + NPCManager.getInstance().spawnLogoutNpc(player); } } @@ -117,14 +129,11 @@ public class SafeLog extends MiniPlugin stream.close(); - UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), () -> { - public void run() - { - _clansManager.ClanTips.displayTip(TipType.NPC_RIPPARONI, player); - UtilPlayer.message(player, F.main("SafeLog", "You were killed by " + F.elem(killerName) + " when you logged out! This happened about " + F.time(UtilTime.MakeStr(System.currentTimeMillis() - time))) + " ago."); - UtilTextMiddle.display("Offline Death", "Log out in a safer place next time!", 15, 80, 40, player); - } + _clansManager.ClanTips.displayTip(TipType.NPC_RIPPARONI, player); + UtilPlayer.message(player, F.main("SafeLog", "You were killed by " + F.elem(killerName) + " when you logged out! This happened about " + F.time(UtilTime.MakeStr(System.currentTimeMillis() - time))) + " ago."); + UtilTextMiddle.display("Offline Death", "Log out in a safer place next time!", 15, 80, 40, player); }, 15); deathFile.delete();