From b672d38db8ae4961f88a674c490950c2e5b0f7b4 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 4 Oct 2011 10:13:44 +0100 Subject: [PATCH 1/4] Fix for /tjail not teleporting users back due to cooldown. --- Essentials/src/com/earth2me/essentials/Teleport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 608663561..845f9c3a3 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -256,7 +256,7 @@ public class Teleport implements Runnable public void back() throws Exception { - back(null); + now(new Target(user.getLastLocation())); } public void home(IUser user, String home, Trade chargeFor) throws Exception From 531f40ceee55d44528f35783d5572a5b5c5292e9 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 4 Oct 2011 10:16:35 +0100 Subject: [PATCH 2/4] Less dupe code on last commit. --- Essentials/src/com/earth2me/essentials/Teleport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 845f9c3a3..b4dd819aa 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -256,7 +256,7 @@ public class Teleport implements Runnable public void back() throws Exception { - now(new Target(user.getLastLocation())); + now(user.getLastLocation()); } public void home(IUser user, String home, Trade chargeFor) throws Exception From 4d5121c21d28aa528893f64b29cbf5438710d7d9 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 4 Oct 2011 10:27:58 +0100 Subject: [PATCH 3/4] Revert "Less dupe code on last commit." This reverts commit 531f40ceee55d44528f35783d5572a5b5c5292e9. --- Essentials/src/com/earth2me/essentials/Teleport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index b4dd819aa..845f9c3a3 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -256,7 +256,7 @@ public class Teleport implements Runnable public void back() throws Exception { - now(user.getLastLocation()); + now(new Target(user.getLastLocation())); } public void home(IUser user, String home, Trade chargeFor) throws Exception From 9718e654acf7082413199fd60eea9e62d4a1eb8c Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 4 Oct 2011 14:39:40 +0100 Subject: [PATCH 4/4] Nick length patch --- Essentials/src/com/earth2me/essentials/User.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index fe811e50f..3e335a1df 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -286,7 +286,10 @@ public class User extends UserData implements Comparable, IReplyTo, IUser public void setDisplayNick(String name) { setDisplayName(name); - setPlayerListName(name); + //TODO: Maybe we need to limit nick length, or try use a string trim. + if (name.length() <= 16) { + setPlayerListName(name); + } } public Teleport getTeleport()