From acd441dd2e5fcbfad2927e7c5ccc41cb61f5f522 Mon Sep 17 00:00:00 2001
From: garbagemule <garbagemule@gmail.com>
Date: Mon, 9 Sep 2013 09:04:52 +0200
Subject: [PATCH] Try to fix flight exception with Setup Mode.

---
 .../garbagemule/MobArena/commands/setup/SetupCommand.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java b/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
index ca8e938..0ab3e7e 100644
--- a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
+++ b/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
@@ -382,10 +382,14 @@ public class SetupCommand implements Command, Listener {
             arena.setEnabled(enabled);
             arena.getRegion().save();
             arena.getRegion().reloadAll();
-            player.setFlying(flying);
-            player.setAllowFlight(allowFlight);
             player.getInventory().setContents(items);
             player.getInventory().setArmorContents(armor);
+
+            // setAllowFlight(false) also handles setFlying(false)
+            player.setAllowFlight(allowFlight);
+            if (allowFlight) {
+                player.setFlying(flying);
+            }
         }