From 6d886697eb2c1c8eee80289baafbacc5bd54ebd8 Mon Sep 17 00:00:00 2001 From: MClausz Date: Tue, 27 Oct 2015 15:26:30 +0700 Subject: [PATCH 1/2] Added player's max health --- src/nl/Steffion/BlockHunt/PlayerArenaData.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nl/Steffion/BlockHunt/PlayerArenaData.java b/src/nl/Steffion/BlockHunt/PlayerArenaData.java index 01bd973..f0baec2 100644 --- a/src/nl/Steffion/BlockHunt/PlayerArenaData.java +++ b/src/nl/Steffion/BlockHunt/PlayerArenaData.java @@ -13,18 +13,20 @@ public class PlayerArenaData { public ItemStack[] pArmor; public Float pEXP; public Integer pEXPL; + public Double pMaxHealth; 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, + public PlayerArenaData(Location pLocation, GameMode pGameMode, ItemStack[] pInventory, ItemStack[] pArmor, Float pEXP, Integer pEXPL, Double pMaxHealth, Double pHealth, Integer pFood, Collection pPotionEffects, boolean pFlying) { this.pGameMode = pGameMode; this.pInventory = pInventory; this.pArmor = pArmor; this.pEXP = pEXP; this.pEXPL = pEXPL; + this.pMaxHealth = pMaxHealth; this.pHealth = pHealth; this.pFood = pFood; this.pPotionEffects = pPotionEffects; From 5047f6747ce52b5d45352235adb3ce1613f50171 Mon Sep 17 00:00:00 2001 From: MClausz Date: Tue, 27 Oct 2015 15:27:18 +0700 Subject: [PATCH 2/2] Update player's max health when they join/leave --- src/nl/Steffion/BlockHunt/ArenaHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java index 4a005e7..eaf50df 100644 --- a/src/nl/Steffion/BlockHunt/ArenaHandler.java +++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java @@ -104,7 +104,7 @@ public class ArenaHandler { Bukkit.getPluginManager().callEvent(event); PlayerArenaData pad = new PlayerArenaData(player.getLocation(), player.getGameMode(), player.getInventory().getContents(), player - .getInventory().getArmorContents(), player.getExp(), player.getLevel(), player.getHealth(), player.getFoodLevel(), + .getInventory().getArmorContents(), player.getExp(), player.getLevel(), player.getMaxHealth(), player.getHealth(), player.getFoodLevel(), player.getActivePotionEffects(), player.getAllowFlight()); W.pData.put(player, pad); @@ -116,6 +116,7 @@ public class ArenaHandler { } player.setFoodLevel(20); player.setHealth(20); + player.setMaxHealth(20); player.setLevel(arena.timer); player.setExp(0); player.getInventory().clear(); @@ -285,7 +286,7 @@ public class ArenaHandler { } } - PlayerArenaData pad = new PlayerArenaData(null, null, null, null, null, null, null, null, null, false); + PlayerArenaData pad = new PlayerArenaData(null, null, null, null, null, null, null, null, null, null, false); if (W.pData.get(player) != null) { pad = W.pData.get(player); @@ -297,6 +298,7 @@ public class ArenaHandler { player.updateInventory(); player.setExp(pad.pEXP); player.setLevel(pad.pEXPL); + player.setMaxHealth(pad.pMaxHealth); player.setHealth(pad.pHealth); player.setFoodLevel(pad.pFood); player.addPotionEffects(pad.pPotionEffects); @@ -467,4 +469,4 @@ public class ArenaHandler { } return true; } -} \ No newline at end of file +}