From 1912d2c23e0d595d5e943966fc75991b09675ea2 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Tue, 19 Aug 2014 21:43:12 -0500 Subject: [PATCH] Update EntityPlayer with recent craftbukkit changes --- .../src/net/minecraft/server/v1_7_R4/EntityPlayer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/EntityPlayer.java b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/EntityPlayer.java index 229244235..15eaf0373 100644 --- a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/EntityPlayer.java +++ b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/EntityPlayer.java @@ -384,7 +384,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { IChatBaseComponent chatmessage = this.aW().b(); String deathmessage = chatmessage.c(); - org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage); + org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); String deathMessage = event.getDeathMessage(); @@ -397,7 +397,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. - if (!keepInventory) { + if (!event.getKeepInventory()) { for (int i = 0; i < this.inventory.items.length; ++i) { this.inventory.items[i] = null; }