From 03cc7f739438691a01a4dc00669bb62fe64c9118 Mon Sep 17 00:00:00 2001 From: vemacs Date: Sat, 13 Jun 2015 16:18:42 -0600 Subject: [PATCH] Perform a null check for teleport cooldowns to prevent exceptions when players log out before cooldown --- src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java index 9ba524e5..a49cdb20 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java @@ -9,6 +9,7 @@ import com.massivecraft.factions.util.WarmUpUtil; import com.massivecraft.factions.zcore.util.TL; import mkremins.fanciful.FancyMessage; import org.bukkit.ChatColor; +import org.bukkit.entity.Player; import java.util.Map; @@ -46,8 +47,11 @@ public class CmdFWarp extends FCommand { this.doWarmUp(WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warpName, new Runnable() { @Override public void run() { - CmdFWarp.this.fme.getPlayer().teleport(CmdFWarp.this.myFaction.getWarp(warpName).getLocation()); - CmdFWarp.this.fme.msg(TL.COMMAND_FWARP_WARPED, warpName); + Player player = CmdFWarp.this.fme.getPlayer(); + if (player != null) { + player.teleport(CmdFWarp.this.myFaction.getWarp(warpName).getLocation()); + CmdFWarp.this.fme.msg(TL.COMMAND_FWARP_WARPED, warpName); + } } }, this.p.getConfig().getLong("warmups.f-warp", 0)); } else {