diff --git a/.gitignore b/.gitignore index 3910da63..d9bf3150 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /nbproject/private/ /dist/ /build/ -appinfo.properties buildnumber.properties # eclipse excludes (JeromSar) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java index ec3215c0..2d94e897 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java @@ -35,11 +35,11 @@ public class Command_list extends TFM_Command { if(TFM_SuperadminList.isSeniorAdmin(p)) { - prefix = (ChatColor.GOLD + "[SenAdmin]"); + prefix = (ChatColor.LIGHT_PURPLE + "[SenAdmin]"); } else { - prefix = (ChatColor.RED + "[SupAdmin]"); + prefix = (ChatColor.GOLD + "[SupAdmin]"); } } else diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 24cd762b..4c7230f3 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -478,7 +478,11 @@ public class TFM_PlayerListener implements Listener { block_command = true; } - else if (TFM_SuperadminList.isUserSuperadmin(p) && Pattern.compile("^/socialspy").matcher(command).find()) + else if (!TFM_SuperadminList.isUserSuperadmin(p) && Pattern.compile("^/socialspy").matcher(command).find()) + { + block_command = true; + } + else if (!TFM_SuperadminList.isUserSuperadmin(p) && Pattern.compile("^/packet").matcher(command).find()) { block_command = true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java index b0362d28..3bae4181 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java @@ -15,10 +15,9 @@ import org.bukkit.World; public class TFM_ProtectedArea implements Serializable { - // Serializable Classes need one of these apperantly - private static final long serialVersionUID = 1L; - public static final double MAX_RADIUS = 50.0D; + private static final long serialVersionUID = -3270338811000937254L; + public static final double MAX_RADIUS = 50.0D; private static Map protectedAreas = new HashMap(); private final SerializableLocation center_location; private final double radius;