diff options
author | Jerom van der Sar <jerom.sar@hotmail.com> | 2014-07-31 03:05:08 +0200 |
---|---|---|
committer | turt2live <travpc@gmail.com> | 2014-08-17 11:41:40 -0600 |
commit | 80e8f2ab8709dedc9fa491907f623d5e371f3d3f (patch) | |
tree | 4e1f0298fda52d939d7bdde832a495a985c7c0b4 /src/main/java/org/bukkit | |
parent | 3626720d537371277e05891240835b67d46d617e (diff) | |
download | craftbukkit-80e8f2ab8709dedc9fa491907f623d5e371f3d3f.tar craftbukkit-80e8f2ab8709dedc9fa491907f623d5e371f3d3f.tar.gz craftbukkit-80e8f2ab8709dedc9fa491907f623d5e371f3d3f.tar.lz craftbukkit-80e8f2ab8709dedc9fa491907f623d5e371f3d3f.tar.xz craftbukkit-80e8f2ab8709dedc9fa491907f623d5e371f3d3f.zip |
Implement ability to keep items on death via plugins. Adds BUKKIT-5724
When a player dies their inventory is normally scattered over the the area
in which they died. Plugins should be able to modify this behaviour by
defining whether or not the player's inventory will be dropped on the ground or waiting for the player when they eventually respawn.
This commit implements the methods included in the Bukkit half for the new
behaviour by acting upon the boolean flag. The boolean flag is tested
prior to clearing the inventory as well as prior to dropping the items on
the ground. If the flag is true (indicating "keep inventory"), the items
are not removed from the player's inventory and are not dropped on the
ground.
Diffstat (limited to 'src/main/java/org/bukkit')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 0fff227f..9b10c418 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -372,9 +372,10 @@ public class CraftEventFactory { return event; } - public static PlayerDeathEvent callPlayerDeathEvent(EntityPlayer victim, List<org.bukkit.inventory.ItemStack> drops, String deathMessage) { + public static PlayerDeathEvent callPlayerDeathEvent(EntityPlayer victim, List<org.bukkit.inventory.ItemStack> drops, String deathMessage, boolean keepInventory) { CraftPlayer entity = victim.getBukkitEntity(); PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage); + event.setKeepInventory(keepInventory); org.bukkit.World world = entity.getWorld(); Bukkit.getServer().getPluginManager().callEvent(event); @@ -384,6 +385,10 @@ public class CraftEventFactory { victim.expToDrop = event.getDroppedExp(); victim.newExp = event.getNewExp(); + if (event.getKeepInventory()) { + return event; + } + for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { if (stack == null || stack.getType() == Material.AIR) continue; |