From d3c102373f90cffa1be2a19ce671d99d563ff9ca Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 29 Mar 2022 13:15:26 -0700 Subject: fix player loottables running when mob loot gamerule is false (#7651) --- ...loottables-running-when-mob-loot-gamerule.patch | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/server/0886-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0886-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0886-fix-player-loottables-running-when-mob-loot-gamerule.patch new file mode 100644 index 0000000000..67527ed0cd --- /dev/null +++ b/patches/server/0886-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 +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 e74c13e7aaa144fcd07036de70e80bebf0be698a..fd8675f74ea787906b83d863940959efbf8bfac9 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -846,12 +846,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(source, 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(); + -- cgit v1.2.3