summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-22 19:13:59 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-22 19:13:59 +0000
commit0c0499bbfde896675fa64bd0e141336dca4cafb1 (patch)
tree53bc9b0e7f3c4f8883cba939d1d2e21958a07105
parent5ae48481bd230051407bf4d33f23a1fadd652b21 (diff)
downloadEssentials-0c0499bbfde896675fa64bd0e141336dca4cafb1.tar
Essentials-0c0499bbfde896675fa64bd0e141336dca4cafb1.tar.gz
Essentials-0c0499bbfde896675fa64bd0e141336dca4cafb1.tar.lz
Essentials-0c0499bbfde896675fa64bd0e141336dca4cafb1.tar.xz
Essentials-0c0499bbfde896675fa64bd0e141336dca4cafb1.zip
Sign lines with color only support 13 characters. Fixes the trade signs for users with names longer than 13 characters.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1513 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
index fd521bacc..a29168b42 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
@@ -30,7 +30,7 @@ public class EssentialsEcoBlockListener extends BlockListener
return;
}
User user = ess.getUser(event.getPlayer());
- String username = user.getName().substring(0, user.getName().length() > 14 ? 14 : user.getName().length());
+ String username = user.getName().substring(0, user.getName().length() > 13 ? 13 : user.getName().length());
if (event.getBlock().getType() != Material.WALL_SIGN && event.getBlock().getType() != Material.SIGN_POST)
{
return;
@@ -101,7 +101,7 @@ public class EssentialsEcoBlockListener extends BlockListener
return;
}
User user = ess.getUser(event.getPlayer());
- String username = user.getName().substring(0, user.getName().length() > 14 ? 14 : user.getName().length());
+ String username = user.getName().substring(0, user.getName().length() > 13 ? 13 : user.getName().length());
if ((event.getLine(0).equalsIgnoreCase("[Buy]") || event.getLine(0).equalsIgnoreCase("#1[Buy]")) && user.isAuthorized("essentials.signs.buy.create"))
{
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
index fb7aab128..20f2f29c0 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
@@ -31,7 +31,7 @@ public class EssentialsEcoPlayerListener extends PlayerListener
return;
}
User user = ess.getUser(event.getPlayer());
- String username = user.getName().substring(0, user.getName().length() > 14 ? 14 : user.getName().length());
+ String username = user.getName().substring(0, user.getName().length() > 13 ? 13 : user.getName().length());
if (event.getClickedBlock().getType() != Material.WALL_SIGN && event.getClickedBlock().getType() != Material.SIGN_POST)
{
return;
@@ -91,8 +91,8 @@ public class EssentialsEcoPlayerListener extends PlayerListener
{
try
{
- String[] l1 = sign.getLines()[1].split("[ :-]+");
- String[] l2 = sign.getLines()[2].split("[ :-]+");
+ String[] l1 = sign.getLine(1).split("[ :-]+");
+ String[] l2 = sign.getLine(2).split("[ :-]+");
boolean m1 = l1[0].matches("[^0-9][0-9]+(\\.[0-9]+)?");
boolean m2 = l2[0].matches("[^0-9][0-9]+(\\.[0-9]+)?");
double q1 = Double.parseDouble(m1 ? l1[0].substring(1) : l1[0]);
@@ -110,7 +110,7 @@ public class EssentialsEcoPlayerListener extends PlayerListener
ItemStack qi1 = m1 ? null : ItemDb.get(l1[1], (int)q1);
ItemStack qi2 = m2 ? null : ItemDb.get(l2[1], (int)q2);
- if (username.equals(sign.getLines()[3].substring(2)))
+ if (username.equals(sign.getLine(3).substring(2)))
{
if (m1)
{