From b2e27ec8bfce70d151d10efd7469fe74e48d61be Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 8 Jan 2014 16:34:57 -0800 Subject: [PATCH 1/4] Changed global freeze message to prevent whining players. Addresses http://www.totalfreedom.boards.net/post/86571. --- src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java index 734fccd5..cae0cfb6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java @@ -22,7 +22,7 @@ public class Command_fr extends TFM_Command if (TotalFreedomMod.allPlayersFrozen) { - TFM_Util.adminAction(sender.getName(), "Freezing all players", false); + TFM_Util.adminAction(sender.getName(), "Freezing all players due to rule breakers", false); TotalFreedomMod.allPlayersFrozen = true; if (TotalFreedomMod.freezePurgeTask != null) From 8b2532e9e98643224ffe9c527d89e6263111bd20 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 15 Jan 2014 09:51:07 -0800 Subject: [PATCH 2/4] Re-thinking this. --- .../TotalFreedomMod/Commands/Command_fr.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java index cae0cfb6..be4ba569 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java @@ -1,9 +1,11 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; +import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.ChatColor; +import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -22,7 +24,15 @@ public class Command_fr extends TFM_Command if (TotalFreedomMod.allPlayersFrozen) { - TFM_Util.adminAction(sender.getName(), "Freezing all players due to rule breakers", false); + TFM_Util.adminAction(sender.getName(), "Freezing all players", false); + for (Player p : Bukkit.getOnlinePlayers()) + { + if (TFM_SuperadminList.isUserSuperadmin(p)) + { + // Do nothing + } + playerMsg("You have been frozen due to rule breaker(s), you will be unfrozen very soon.", ChatColor.RED); + } TotalFreedomMod.allPlayersFrozen = true; if (TotalFreedomMod.freezePurgeTask != null) From 049432789fd8d6b0069ed20d3aab3d69f65f7429 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 15 Jan 2014 13:38:35 -0800 Subject: [PATCH 3/4] Now make it actually work... --- .../TotalFreedomMod/Commands/Command_fr.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java index be4ba569..5baab3b4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java @@ -25,14 +25,6 @@ public class Command_fr extends TFM_Command if (TotalFreedomMod.allPlayersFrozen) { TFM_Util.adminAction(sender.getName(), "Freezing all players", false); - for (Player p : Bukkit.getOnlinePlayers()) - { - if (TFM_SuperadminList.isUserSuperadmin(p)) - { - // Do nothing - } - playerMsg("You have been frozen due to rule breaker(s), you will be unfrozen very soon.", ChatColor.RED); - } TotalFreedomMod.allPlayersFrozen = true; if (TotalFreedomMod.freezePurgeTask != null) @@ -50,6 +42,13 @@ public class Command_fr extends TFM_Command }.runTaskLater(plugin, 20L * 60L * 5L); playerMsg("Players are now frozen."); + for (Player p : Bukkit.getOnlinePlayers()) + { + if (!TFM_SuperadminList.isUserSuperadmin(p)) + { + p.sendMessage(ChatColor.RED + "You have been frozen due to rule breaker(s), you will be unfrozen very soon."); + } + } } else { From 42812be4c56255887ac8f5598c1c3ba045ba5a3b Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 15 Jan 2014 13:45:28 -0800 Subject: [PATCH 4/4] there --- .../TotalFreedomMod/Commands/Command_fr.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java index 5baab3b4..7e36d719 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java @@ -42,12 +42,12 @@ public class Command_fr extends TFM_Command }.runTaskLater(plugin, 20L * 60L * 5L); playerMsg("Players are now frozen."); - for (Player p : Bukkit.getOnlinePlayers()) + for (Player player : Bukkit.getOnlinePlayers()) { - if (!TFM_SuperadminList.isUserSuperadmin(p)) - { - p.sendMessage(ChatColor.RED + "You have been frozen due to rule breaker(s), you will be unfrozen very soon."); - } + if (!TFM_SuperadminList.isUserSuperadmin(player)) + { + TFM_Util.playerMsg(player, "You have been frozen due to rule breaker(s), you will be unfrozen very soon.", ChatColor.RED); + } } } else