diff options
Diffstat (limited to 'patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch')
| -rw-r--r-- | patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch new file mode 100644 index 0000000000..7730bb996e --- /dev/null +++ b/patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Tue, 22 Mar 2022 09:50:40 -0700 +Subject: [PATCH] fix player loottables running when mob loot gamerule is false + + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index 97054a83f90cd1dc440b7c319c91014b237e36dc..edd8eb7e9b4c676bd823a5081f3f23f8eda13eba 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -917,12 +917,14 @@ public class ServerPlayer extends Player { + } + } + } ++ if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - preserve this check from vanilla + // SPIGOT-5071: manually add player loot tables (SPIGOT-5195 - ignores keepInventory rule) + this.dropFromLootTable(damageSource, this.lastHurtByPlayerTime > 0); + for (org.bukkit.inventory.ItemStack item : this.drops) { + loot.add(item); + } + this.drops.clear(); // SPIGOT-5188: make sure to clear ++ } // Paper + + Component defaultMessage = this.getCombatTracker().getDeathMessage(); + |