From 6e9177fdff6f12a08950e4664e8cf6d754c8b267 Mon Sep 17 00:00:00 2001 From: Steffion Date: Sat, 28 Sep 2013 21:45:09 +0200 Subject: [PATCH] * Fixed player won't fly in arena if they where able before. --- src/nl/Steffion/BlockHunt/ArenaHandler.java | 7 +++++-- src/nl/Steffion/BlockHunt/PlayerArenaData.java | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java index 0a5fb68..b694d4e 100644 --- a/src/nl/Steffion/BlockHunt/ArenaHandler.java +++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java @@ -97,7 +97,8 @@ public class ArenaHandler { player.getExp(), player.getLevel(), player.getHealth(), player.getFoodLevel(), - player.getActivePotionEffects()); + player.getActivePotionEffects(), + player.isFlying()); W.pData.put(player, pad); @@ -117,6 +118,7 @@ public class ArenaHandler { new ItemStack(Material.AIR)); player.getInventory().setBoots( new ItemStack(Material.AIR)); + player.setFlying(false); if ((Boolean) W.config .get(ConfigC.shop_blockChooserEnabled) == true) { @@ -257,7 +259,7 @@ public class ArenaHandler { } PlayerArenaData pad = new PlayerArenaData(null, null, null, null, - null, null, null, null, null); + null, null, null, null, null, false); if (W.pData.get(player) != null) { pad = W.pData.get(player); @@ -274,6 +276,7 @@ public class ArenaHandler { player.addPotionEffects(pad.pPotionEffects); player.teleport(pad.pLocation); player.setGameMode(pad.pGameMode); + player.setFlying(pad.pFlying); W.pData.remove(player); diff --git a/src/nl/Steffion/BlockHunt/PlayerArenaData.java b/src/nl/Steffion/BlockHunt/PlayerArenaData.java index 4ca9b05..4e98204 100644 --- a/src/nl/Steffion/BlockHunt/PlayerArenaData.java +++ b/src/nl/Steffion/BlockHunt/PlayerArenaData.java @@ -17,11 +17,12 @@ public class PlayerArenaData { public Double pHealth; public Integer pFood; public Collection pPotionEffects; + public boolean pFlying; public PlayerArenaData (Location pLocation, GameMode pGameMode, ItemStack[] pInventory, ItemStack[] pArmor, Float pEXP, Integer pEXPL, Double pHealth, Integer pFood, - Collection pPotionEffects) { + Collection pPotionEffects, boolean pFlying) { this.pLocation = pLocation; this.pGameMode = pGameMode; this.pInventory = pInventory; @@ -31,5 +32,6 @@ public class PlayerArenaData { this.pHealth = pHealth; this.pFood = pFood; this.pPotionEffects = pPotionEffects; + this.pFlying = pFlying; } }