From 1fa2abcc889c4bae604e4bffca7fd6f324096c1d Mon Sep 17 00:00:00 2001 From: vemacs Date: Mon, 7 Sep 2015 08:00:58 -0600 Subject: [PATCH] Resolve NPE on /f warp with cooldown --- .../java/com/massivecraft/factions/cmd/CmdFWarp.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java index a49cdb20..705541a6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java @@ -8,10 +8,12 @@ import com.massivecraft.factions.util.LazyLocation; import com.massivecraft.factions.util.WarmUpUtil; import com.massivecraft.factions.zcore.util.TL; import mkremins.fanciful.FancyMessage; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import java.util.Map; +import java.util.UUID; public class CmdFWarp extends FCommand { @@ -44,13 +46,15 @@ public class CmdFWarp extends FCommand { if (!transact(fme)) { return; } + final FPlayer fPlayer = fme; + final UUID uuid = fme.getPlayer().getUniqueId(); this.doWarmUp(WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warpName, new Runnable() { @Override public void run() { - Player player = CmdFWarp.this.fme.getPlayer(); + Player player = Bukkit.getPlayer(uuid); if (player != null) { - player.teleport(CmdFWarp.this.myFaction.getWarp(warpName).getLocation()); - CmdFWarp.this.fme.msg(TL.COMMAND_FWARP_WARPED, warpName); + player.teleport(fPlayer.getFaction().getWarp(warpName).getLocation()); + fPlayer.msg(TL.COMMAND_FWARP_WARPED, warpName); } } }, this.p.getConfig().getLong("warmups.f-warp", 0));