From fc5d45d8c4200bd9c1cbf25283b2f50691849b90 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sun, 18 Dec 2011 02:47:56 -0600 Subject: [PATCH] New conf.json setting "removePlayerDataWhenBanned" (default true), which can be disabled to prevent Factions from deleting player data for players when they are banned from the server --- src/com/massivecraft/factions/Conf.java | 3 ++- .../factions/listeners/FactionsPlayerListener.java | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 39135683..5ada25b9 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -66,7 +66,8 @@ public class Conf public static String allianceChatFormat = ChatColor.LIGHT_PURPLE+"%s:"+ChatColor.WHITE+" %s"; public static double autoLeaveAfterDaysOfInactivity = 10.0; - + public static boolean removePlayerDataWhenBanned = true; + public static boolean worldGuardChecking = false; // server logging options diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 472e7719..6191ff86 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -175,11 +175,6 @@ public class FactionsPlayerListener extends PlayerListener @Override public void onPlayerMove(PlayerMoveEvent event) { - // Did we change block? - if (event.getFrom().equals(event.getTo()) - || (event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockZ() == event.getTo().getBlockZ()) - ) return; - Player player = event.getPlayer(); FPlayer me = FPlayers.i.get(player); @@ -623,7 +618,7 @@ public class FactionsPlayerListener extends PlayerListener SpoutFeatures.playerDisconnect(badGuy); // if player was banned (not just kicked), get rid of their stored info - if (event.getReason().equals("Banned by admin.")) + if (Conf.removePlayerDataWhenBanned && event.getReason().equals("Banned by admin.")) { badGuy.leave(false); badGuy.markForDeletion(true);