From f49c4568b297de44a7a1bdbff80ccf19a2f5501e Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Tue, 24 Sep 2013 20:32:04 -0400 Subject: [PATCH] Tweaks to essentials interface commands. --- appinfo.properties | 6 +++--- buildnumber.properties | 4 ++-- nbproject/project.properties | 2 +- .../TotalFreedomMod/Commands/Command_colorme.java | 2 +- .../TotalFreedomMod/Commands/Command_nicknyan.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index 44106d3e..95ce5b0b 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Tue, 24 Sep 2013 10:08:38 -0400 +#Tue, 24 Sep 2013 20:09:17 -0400 program.VERSION=3.2 -program.BUILDNUM=604 -program.BUILDDATE=09/24/2013 10\:08 AM +program.BUILDNUM=611 +program.BUILDDATE=09/24/2013 08\:09 PM diff --git a/buildnumber.properties b/buildnumber.properties index b28d7af3..a81fb8ae 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Sep 24 10:08:38 EDT 2013 -build.number=605 +#Tue Sep 24 20:09:17 EDT 2013 +build.number=612 diff --git a/nbproject/project.properties b/nbproject/project.properties index 4199cdb3..c6a3e4ef 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -87,7 +87,7 @@ jnlp.signing.keystore= main.class=totalfreedommod.TotalFreedomMod manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false +mkdist.disabled=true platform.active=default_platform run.classpath=\ ${javac.classpath}:\ diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java index a09ec90e..3dea3e92 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java @@ -47,7 +47,7 @@ public class Command_colorme extends TFM_Command return true; } - final String newNick = color + ChatColor.stripColor(sender_p.getDisplayName()) + ChatColor.WHITE; + final String newNick = color + ChatColor.stripColor(sender_p.getDisplayName()).trim() + ChatColor.WHITE; TFM_EssentialsBridge.getInstance().setNickname(sender.getName(), newNick); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java index 025370d8..c1e3547e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java @@ -46,7 +46,7 @@ public class Command_nicknyan extends TFM_Command { continue; } - if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).equalsIgnoreCase(nickPlain)) + if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).trim().equalsIgnoreCase(nickPlain)) { playerMsg("That nickname is already in use."); return true;