mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)

Browse source 
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
This commit is contained in:
Jake Potrebic 2021-08-13 10:08:34 -07:00 • committed by GitHub
parent 80836709e7
commit e942509e73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 152 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch
View file

@ -8,7 +8,7 @@ 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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8d932e57392a472dae08ada6a72a35636401f4f8..8c4052939281061aadbe7b8aba2abda45d7324b5 100644
index 2623ed5aa85de9fa900b2671e557ad32c6e9fe21..8537d010fa698c05c227f71b83b1e743f8578d84 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -725,6 +725,46 @@ public class ServerPlayer extends Player {
@ -58,7 +58,7 @@ index 8d932e57392a472dae08ada6a72a35636401f4f8..8c4052939281061aadbe7b8aba2abda4
@Override
public void die(DamageSource source) {
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES);
@@ -809,6 +849,12 @@ public class ServerPlayer extends Player {
@@ -811,6 +851,12 @@ public class ServerPlayer extends Player {
// we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
if (!event.getKeepInventory()) {
this.getInventory().clearContent();