TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-05-15 07:31:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge with upstream

Browse source
This commit is contained in:
JeromSar 2015-06-11 22:29:39 +02:00
parent 27004da544 c0c4c25875
commit bf1d779b95
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java
View file

@ -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;

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
View file

@ -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() + ".");
}
}

4
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View file

@ -81,7 +81,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;
}
@ -94,7 +94,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;
}

2
src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
View file

@ -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();