cats.coffee / Bukkit / 1c220ddc6e0

Commits

Jerom van der Sar authored and turt2live committed 1c220ddc6e0 31 Jul 2014

Add 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 adds the methods required to the PlayerDeathEvent for plugins
to be able to incorporate the behaviour mentioned as a simple boolean
flag.

src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java

Modified

-7
-8
+/**
-9
+ * Thrown whenever a {@link Player} dies
-10
+ */
-11
+public class PlayerDeathEvent extends EntityDeathEvent {
-12
+    private int newExp = 0;
-13
+    private String deathMessage = "";
-14
+    private int newLevel = 0;
-15
+    private int newTotalExp = 0;
-16
+    private boolean keepLevel = false;
-+
+    private boolean keepInventory = false;
-18
-19
+    public PlayerDeathEvent(final Player player, final List<ItemStack> drops, final int droppedExp, final String deathMessage) {
-20
+        this(player, drops, droppedExp, 0, deathMessage);
-21
+    }
-22
-23
+    public PlayerDeathEvent(final Player player, final List<ItemStack> drops, final int droppedExp, final int newExp, final String deathMessage) {
-24
+        this(player, drops, droppedExp, newExp, 0, 0, deathMessage);
-25
+    }
-26
-27
+    public PlayerDeathEvent(final Player player, final List<ItemStack> drops, final int droppedExp, final int newExp, final int newTotalExp, final int newLevel, final String deathMessage) {
-129
+    /**
-130
+     * Sets if the Player should keep all EXP at respawn.
-131
+     * <p>
-132
+     * This overrides all other EXP settings
-133
+     *
-134
+     * @param keepLevel True to keep all current value levels
-135
+     */
-136
+    public void setKeepLevel(boolean keepLevel) {
-137
+        this.keepLevel = keepLevel;
-138
+    }
-+
-+
+    /**
-+
+     * Sets if the Player keeps inventory on death.
-+
+     *
-+
+     * @param keepInventory True to keep the inventory
-+
+     */
-+
+    public void setKeepInventory(boolean keepInventory) {
-+
+        this.keepInventory = keepInventory;
-+
+    }
-+
-+
+    /**
-+
+     * Gets if the Player keeps inventory on death.
-+
+     *
-+
+     * @return True if the player keeps inventory on death
-+
+     */
-+
+    public boolean getKeepInventory() {
-+
+        return keepInventory;
-+
+    }
-157
+}

Bukkit

Commits

Jira Issues

Add shortcut