Merge with master

buildnumber.properties

@@ -1,3 +1,3 @@
-#Build Number for ANT. Do not edit!
+#Build Number for ANT. Do not edit!
 #Fri Feb 20 15:08:04 CET 2015
-build.number=984
+build.number=985

src/config.yml

@@ -117,6 +117,12 @@ blocked_commands:
   - 's:b:/setidletimeout:_'
   - 's:b:/mail sendall:_'
   - 's:b:/eco reset:_'
+  - 's:b:/mask:_'
+  - 's:b:/gmask:_'
+  - 's:b:/tool:_'
+  - 's:b:/lrbuild:_'
+  - 's:b:/defaultgamemode:_'
+  
 
   # Superadmin commands - Auto-eject
   - 's:a:/stop:_'
@@ -206,7 +212,26 @@ announcer:
   announcements:
     - 'Be sure to visit our forums at &6http://totalfreedom.boards.net/'
     - 'You can always review the server rules here: &6http://totalfreedom.me/'
-    - 'If you aren''t OP, be sure to ask!'
+    - 'If you are not OP, be sure to ask!'
+    - 'Somebody breaking the rules?  Report it!  /report <user> <reason>'
+    - 'Griefing is not allowed!'
+    - 'Hacking is allowed!'
+    - 'Interested in becoming admin? Do "/ai" for more information!'
+    - 'You may view all online administrators via "/list -a"'
+    - 'Save your buildings via WorldEdit!  http://totalfreedom.me for more information!'
+    - 'Famous players, such as Notch, are always fake!  We are an offline/cracked server!'
+    - 'You may contact TotalFreedoms Support on Twitter!  pravi.us/nGS'
+    - 'You may download TotalFreedomMod here: pravi.us/V8c'
+    - 'MarkByron is TotalFreedoms owner.'
+    - 'Server lagging?  Check the lag via "/tps"'
+    - 'You are allowed to record and stream videos on TotalFreedom :D'
+    - 'An admin abusing?  Report it! pravi.us/vfa'
+    - 'Player vs Player while in creative/god mode it forbidden!'
+    - 'Spawn killing is forbidden!'
+    - 'Invisible potions are allowed!'
+    - 'Serial griefing and trolling will result in permanently being banned!'
+    - 'TotalFreedom does not accept any form of donations!'
+    - 'Racism, Nazism, and Sexism is strictly forbidden!'
 
 # Players who cannot be banned by username
 unbannable_usernames:

src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java

@@ -5,8 +5,9 @@ import java.util.List;
 import java.util.UUID;
 import java.util.regex.Pattern;
 import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
-import net.minecraft.server.v1_8_R1.MinecraftServer;
-import net.minecraft.server.v1_8_R1.PropertyManager;
+import net.minecraft.server.v1_8_R2.EntityPlayer;
+import net.minecraft.server.v1_8_R2.MinecraftServer;
+import net.minecraft.server.v1_8_R2.PropertyManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -29,9 +30,8 @@ public class TFM_ServerInterface
     {
         String[] whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted();
         int size = whitelisted.length;
-        for (String player : MinecraftServer.getServer().getPlayerList().getWhitelist().getEntries())
-        {
-            MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player);
+        for (EntityPlayer player : MinecraftServer.getServer().getPlayerList().players) {
+            MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player.getProfile());
         }
 
         try
@@ -48,7 +48,7 @@ public class TFM_ServerInterface
 
     public static boolean isWhitelisted()
     {
-        return MinecraftServer.getServer().getPlayerList().hasWhitelist;
+        return MinecraftServer.getServer().getPlayerList().getHasWhitelist();
     }
 
     public static List<?> getWhitelisted()