summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-03-23 18:12:33 +0000
committerKHobbits <rob@khobbits.co.uk>2014-03-23 18:12:33 +0000
commit5c4f31dec42ec9f141c046701df306a63f5a5ad9 (patch)
tree2fd0eea9ba2c52addd640069343e7f32ff0632b3
parent7a31d2e213656a59c375eab01470cb8dd88893b9 (diff)
downloadEssentials-5c4f31dec42ec9f141c046701df306a63f5a5ad9.tar
Essentials-5c4f31dec42ec9f141c046701df306a63f5a5ad9.tar.gz
Essentials-5c4f31dec42ec9f141c046701df306a63f5a5ad9.tar.lz
Essentials-5c4f31dec42ec9f141c046701df306a63f5a5ad9.tar.xz
Essentials-5c4f31dec42ec9f141c046701df306a63f5a5ad9.zip
Fix null teleport costs.
-rw-r--r--Essentials/src/com/earth2me/essentials/TimedTeleport.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/com/earth2me/essentials/TimedTeleport.java
index 1b972c17c..e30eff966 100644
--- a/Essentials/src/com/earth2me/essentials/TimedTeleport.java
+++ b/Essentials/src/com/earth2me/essentials/TimedTeleport.java
@@ -110,7 +110,10 @@ public class TimedTeleport implements Runnable
{
cancelTimer(false);
teleportUser.sendMessage(_("teleportationCommencing"));
- timer_chargeFor.isAffordableFor(teleportOwner);
+ if (timer_chargeFor != null)
+ {
+ timer_chargeFor.isAffordableFor(teleportOwner);
+ }
if (timer_respawn)
{
teleport.respawnNow(teleportUser, timer_cause);