aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch')
-rw-r--r--patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch
new file mode 100644
index 0000000000..185fdf4437
--- /dev/null
+++ b/patches/server/0727-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 be8c6c48287b73693ead9ae22071f2b4af7eed32..0db3f5b06b6c93882761450ea77ba4ee09869c61 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -875,12 +875,14 @@ public class ServerPlayer extends Player {
+ }
+ }
+ }
++ if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - fix player loottables running when mob loot gamerule is false
+ // 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 - fix player loottables running when mob loot gamerule is false
+
+ Component defaultMessage = this.getCombatTracker().getDeathMessage();
+