Skip to content

Commit d3c1023

Browse files
fix player loottables running when mob loot gamerule is false (#7651)
1 parent fa68bb1 commit d3c1023

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jake Potrebic <jake.m.potrebic@gmail.com>
3+
Date: Tue, 22 Mar 2022 09:50:40 -0700
4+
Subject: [PATCH] fix player loottables running when mob loot gamerule is false
5+
6+
7+
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
8+
index e74c13e7aaa144fcd07036de70e80bebf0be698a..fd8675f74ea787906b83d863940959efbf8bfac9 100644
9+
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
10+
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
11+
@@ -846,12 +846,14 @@ public class ServerPlayer extends Player {
12+
}
13+
}
14+
}
15+
+ if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - preserve this check from vanilla
16+
// SPIGOT-5071: manually add player loot tables (SPIGOT-5195 - ignores keepInventory rule)
17+
this.dropFromLootTable(source, this.lastHurtByPlayerTime > 0);
18+
for (org.bukkit.inventory.ItemStack item : this.drops) {
19+
loot.add(item);
20+
}
21+
this.drops.clear(); // SPIGOT-5188: make sure to clear
22+
+ } // Paper
23+
24+
Component defaultMessage = this.getCombatTracker().getDeathMessage();
25+

0 commit comments

Comments
 (0)