mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-16 15:45:23 +01:00
c97ce029e9
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason <jasonpenilla2@me.com> Co-authored-by: kashike <kashike@vq.lc> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: KennyTV <kennytv@t-online.de> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 11 Mar 2013 20:04:34 -0400
|
|
Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
|
|
|
|
Exposes a mutable array on items a player should keep on death
|
|
|
|
Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
|
|
index 07a52441a5cdd7e428a14b286d7cb5210e3efa97..1e97d04b3f3509f82d4cda1773909f91800bf5bc 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
|
|
@@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent {
|
|
private boolean keepLevel = false;
|
|
private boolean keepInventory = false;
|
|
|
|
+ // Paper start
|
|
+ private List<ItemStack> itemsToKeep = new java.util.ArrayList<>();
|
|
+
|
|
+ /**
|
|
+ * A mutable collection to add items that the player should retain in their inventory on death (Similar to KeepInventory game rule)
|
|
+ *
|
|
+ * You <b>MUST</b> remove the item from the .getDrops() collection too or it will duplicate!
|
|
+ * <pre>{@code
|
|
+ * {@literal @EventHandler(ignoreCancelled = true)}
|
|
+ * public void onPlayerDeath(PlayerDeathEvent event) {
|
|
+ * for (Iterator<ItemStack> iterator = event.getDrops().iterator(); iterator.hasNext(); ) {
|
|
+ * ItemStack drop = iterator.next();
|
|
+ * List<String> lore = drop.getLore();
|
|
+ * if (lore != null && !lore.isEmpty()) {
|
|
+ * if (lore.get(0).contains("(SOULBOUND)")) {
|
|
+ * iterator.remove();
|
|
+ * event.getItemsToKeep().add(drop);
|
|
+ * }
|
|
+ * }
|
|
+ * }
|
|
+ * }
|
|
+ * }</pre>
|
|
+ *
|
|
+ * Adding an item to this list that the player did not previously have will give them the item on death.
|
|
+ * An example case could be a "Note" that "You died at X/Y/Z coordinates"
|
|
+ *
|
|
+ * @return The list to hold items to keep
|
|
+ */
|
|
+ @NotNull
|
|
+ public List<ItemStack> getItemsToKeep() {
|
|
+ return itemsToKeep;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public PlayerDeathEvent(@NotNull final Player player, @NotNull final List<ItemStack> drops, final int droppedExp, @Nullable final String deathMessage) {
|
|
this(player, drops, droppedExp, 0, deathMessage);
|
|
}
|