aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0674-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0674-fix-player-loottables-running-when-mob-loot-gamerule.patch')
-rw-r--r--patches/server/0674-fix-player-loottables-running-when-mob-loot-gamerule.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0674-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0674-fix-player-loottables-running-when-mob-loot-gamerule.patch
new file mode 100644
index 0000000000..a858720f1e
--- /dev/null
+++ b/patches/server/0674-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 0efd5d23924efec5e2bff0c7b3dddb6e97723e29..ed8a1457b99f862762e49c84db2585ce410f278a 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -1215,12 +1215,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+ }
+ }
+ }
++ if (this.shouldDropLoot() && this.serverLevel().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(this.serverLevel(), damageSource, this.lastHurtByPlayerTime > 0);
+ this.dropCustomDeathLoot(this.serverLevel(), damageSource, flag);
+
+ loot.addAll(this.drops);
+ 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();
+