From 48ede9d7bfad2218ffc95fe2735c18cb8b7f2439 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Thu, 24 Mar 2011 00:26:01 +0100 Subject: [PATCH] Removed autoLeaveImmunity due to missdesign in the Permissions plugin. --- src/com/bukkit/mcteam/factions/FPlayer.java | 7 ------- src/com/bukkit/mcteam/factions/Factions.java | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/com/bukkit/mcteam/factions/FPlayer.java b/src/com/bukkit/mcteam/factions/FPlayer.java index 6cf53b24..b94e7a11 100644 --- a/src/com/bukkit/mcteam/factions/FPlayer.java +++ b/src/com/bukkit/mcteam/factions/FPlayer.java @@ -510,13 +510,6 @@ public class FPlayer { double toleranceMillis = Conf.autoLeaveAfterDaysOfInactivity * 24 * 60 * 60 * 1000; for (FPlayer fplayer : FPlayer.getAll()) { - // Test if the player is immune - if (Factions.Permissions != null) { - if (Factions.Permissions.has(fplayer.getPlayer(), "factions.autoLeaveImmunity")) { - continue; - } - } - if (now - fplayer.getLastLoginTime() > toleranceMillis) { fplayer.leave(); } diff --git a/src/com/bukkit/mcteam/factions/Factions.java b/src/com/bukkit/mcteam/factions/Factions.java index 79e240a4..ee4c87bd 100644 --- a/src/com/bukkit/mcteam/factions/Factions.java +++ b/src/com/bukkit/mcteam/factions/Factions.java @@ -212,10 +212,6 @@ public class Factions extends JavaPlugin { return hasPerm(sender, "factions.manageSafeZone", true); } - public static boolean hasPermAutoLeaveImmunity(CommandSender sender) { - return hasPerm(sender, "factions.autoLeaveImmunity", true); - } - private static boolean hasPerm(CommandSender sender, String permNode, boolean fallbackOnlyOp) { if (Factions.Permissions == null || ! (sender instanceof Player)) { return fallbackOnlyOp == false || sender.isOp();