Cancel warmup on damage or movement

2015-05-24 23:42:31 -05:00
parent fc1d08e507
commit 1481d604d4
10 changed files with 95 additions and 14 deletions
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
@@ -50,7 +50,7 @@ public class CmdFWarp extends FCommand {
                if (!transact(fme)) {
                    return;
                }
-                this.doWarmUp(TL.WARMUPS_NOTIFY_TELEPORT, warpName, new Runnable() {
+                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());