From 8a92ff132b525fd842832b1bee7d0485c3164c32 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 1 Nov 2014 15:36:24 +0000 Subject: [PATCH] Changed the default config entry for the server address & added a little tweak. --- buildnumber.properties | 4 ++-- src/config.yml | 4 ++-- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 3d3c6162..23a75c6c 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Nov 01 12:07:03 GMT 2014 -build.number=960 +#Sat Nov 01 15:34:44 GMT 2014 +build.number=961 diff --git a/src/config.yml b/src/config.yml index 08f26aef..e1f61c82 100644 --- a/src/config.yml +++ b/src/config.yml @@ -7,7 +7,7 @@ server: name: TotalFreedom # The address your server is located at - Please Note: The port MUST be included, even if it is default port (DNS Records included) - address: 64.34.165.5:28965 + address: play.totalfreedom.me:25565 # Shown at the server list motd: TotalFreedom &8- Minecraft %mcversion% @@ -32,7 +32,7 @@ forceip: enabled: true # Please enter the kick message you wish for people to see if they are not connecting on the servers hostname - kickmsg: You have been kicked from the server - Please connect using play.totalfreedom.me + kickmsg: You have been kicked from the server - Please connect using %address% # Blocking certain events diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 2dba07cd..ddc772e5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -860,7 +860,7 @@ public class TFM_PlayerListener implements Listener { if(!event.getHostname().equalsIgnoreCase(TFM_ConfigEntry.SERVER_ADDRESS.getString())) { - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, TFM_ConfigEntry.FORCE_IP_KICKMSG.getString()); + event.disallow(PlayerLoginEvent.Result.KICK_OTHER, TFM_ConfigEntry.FORCE_IP_KICKMSG.getString().replace("%address%", TFM_ConfigEntry.SERVER_ADDRESS.getString())); } } }