aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch')
-rw-r--r--patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
new file mode 100644
index 0000000000..0f56e9ee1f
--- /dev/null
+++ b/patches/server/0705-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 3db8f376f3a73256d13fd778bb1c80606e6712d9..c9c5e667c2aa26db1fb0038e40598d04a7c80889 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -942,12 +942,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();
+