Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix null check position in PlayerDeathListener

Browse Source
This commit is contained in:
Daniel Saukel 2015-09-10 14:49:51 +02:00
parent 9fcdba3d1c
commit 56c3e982ba
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/dre/dungeonsxl/listener/player/PlayerDeathListener.java
View File

@ -26,8 +26,8 @@ public class PlayerDeathListener implements Listener {
DConfig dConfig = GameWorld.get(player.getLocation().getWorld()).config; DConfig dConfig = GameWorld.get(player.getLocation().getWorld()).config;
if (dConfig.getKeepInventoryOnDeath()) {
if (dPlayer != null) { if (dPlayer != null) {
if (dConfig.getKeepInventoryOnDeath()) {
dPlayer.respawnInventory = event.getEntity().getInventory().getContents(); dPlayer.respawnInventory = event.getEntity().getInventory().getContents();
dPlayer.respawnArmor = event.getEntity().getInventory().getArmorContents(); dPlayer.respawnArmor = event.getEntity().getInventory().getArmorContents();
// Delete all drops // Delete all drops
@ -35,7 +35,6 @@ public class PlayerDeathListener implements Listener {
istack.setType(Material.AIR); istack.setType(Material.AIR);
} }
} }
}
if (p.lives.containsKey(player)) { if (p.lives.containsKey(player)) {
lives = p.lives.get(player) - 1; lives = p.lives.get(player) - 1;
@ -48,6 +47,7 @@ public class PlayerDeathListener implements Listener {
} else if (!(lives == -1)) { } else if (!(lives == -1)) {
p.msg(player, p.language.get("Player_Death").replaceAll("v1", String.valueOf(lives))); p.msg(player, p.language.get("Player_Death").replaceAll("v1", String.valueOf(lives)));
} }
}
} }