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
commit3538728733e035c532c1fef3835761610d3916ce (patch)
tree4fad3e80699a993bc3413028d65d9884ef335d6e
parent0b5718f7ffc249126199a8eb2278cde47a997506 (diff)
downloadEssentials-3538728733e035c532c1fef3835761610d3916ce.tar
Essentials-3538728733e035c532c1fef3835761610d3916ce.tar.gz
Essentials-3538728733e035c532c1fef3835761610d3916ce.tar.lz
Essentials-3538728733e035c532c1fef3835761610d3916ce.tar.xz
Essentials-3538728733e035c532c1fef3835761610d3916ce.zip
Fix null teleport costs.stable-2.13.1
-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);