From 7ac7b75ae6006f6dd32b2f5058fcf34190ff50cb Mon Sep 17 00:00:00 2001
From: ChargedCreeper <actionsplash@gmail.com>
Date: Tue, 12 May 2015 20:49:11 -0400
Subject: [PATCH 1/4] Allow admins to use lava/water buckets

---
 .../TotalFreedomMod/Listener/TFM_PlayerListener.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index 9f4a349..b0152eb 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -53,7 +53,7 @@ public class TFM_PlayerListener implements Listener
                 {
                     case WATER_BUCKET:
                     {
-                        if (TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
+                        if (TFM_AdminList.isSuperAdmin(player) || TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                         {
                             break;
                         }
@@ -66,7 +66,7 @@ public class TFM_PlayerListener implements Listener
 
                     case LAVA_BUCKET:
                     {
-                        if (TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
+                        if (TFM_AdminList.isSuperAdmin(player) || TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                         {
                             break;
                         }

From acc8f3e2b8b76f01ddc1016dbfdc28a9d2300baa Mon Sep 17 00:00:00 2001
From: Revalation <hentscheljr1@aol.com>
Date: Wed, 29 Apr 2015 23:09:15 -0400
Subject: [PATCH 2/4] Changed /kicknoob message to be more user-friendly

---
 buildnumber.properties                                        | 4 ++--
 .../TotalFreedomMod/Commands/Command_kicknoob.java            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildnumber.properties b/buildnumber.properties
index 68a0247..b959849 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon Apr 27 00:47:37 CEST 2015
-build.number=993
+#Sun Jun 07 17:27:04 CEST 2015
+build.number=994
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
index 4c2ef44..c66c9da 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
@@ -20,7 +20,7 @@ public class Command_kicknoob extends TFM_Command
         {
             if (!TFM_AdminList.isSuperAdmin(player))
             {
-                player.kickPlayer(ChatColor.RED + "Disconnected by admin.");
+                player.kickPlayer(ChatColor.RED + "All non-superadmins were kicked by " + sender.getName() + ".");
             }
         }
 

From 1ed1b352f301e373b64769f79909c9cfec2da5be Mon Sep 17 00:00:00 2001
From: ChargedCreeper <actionsplash@gmail.com>
Date: Wed, 3 Jun 2015 14:40:12 -0400
Subject: [PATCH 3/4] Properly allow Forge clients to log in. Fixes #493

---
 src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
index 0f7ea8f..0e9f77f 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
@@ -112,7 +112,7 @@ public class TFM_ServerInterface
         // Check force-IP match
         if (TFM_ConfigEntry.FORCE_IP_ENABLED.getBoolean())
         {
-            final String hostname = event.getHostname().replace("FML", ""); // Forge fix - https://github.com/TotalFreedom/TotalFreedomMod/issues/493
+            final String hostname = event.getHostname().replace("\u0000FML\u0000", ""); // Forge fix - https://github.com/TotalFreedom/TotalFreedomMod/issues/493
             final String connectAddress = TFM_ConfigEntry.SERVER_ADDRESS.getString();
             final int connectPort = TotalFreedomMod.server.getPort();
 

From adbaf9341d1d5e7abcde24a3aca0632fe3d0b766 Mon Sep 17 00:00:00 2001
From: Revalation <hentscheljr1@aol.com>
Date: Thu, 30 Apr 2015 21:04:50 -0400
Subject: [PATCH 4/4] Grammar fix in Command_invis.java

---
 src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java
index 29e6486..3247032 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java
@@ -59,7 +59,7 @@ public class Command_invis extends TFM_Command
         }
         else
         {
-            playerMsg("Invisble players (" + players.size() + "): " + StringUtils.join(players, ", "));
+            playerMsg("Invisible players (" + players.size() + "): " + StringUtils.join(players, ", "));
         }
 
         return true;