2022-03-29 22:15:26 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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
2024-06-14 23:07:44 +02:00
index a9a0e6c495c696a40bdc8147e9a2856500e422e5..af19742353008b42f5e12ed4e9351e3a3697c925 100644
2022-03-29 22:15:26 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2024-06-14 03:30:23 +02:00
@@ -961,12 +961,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
2022-03-29 22:15:26 +02:00
}
}
}
2024-01-18 18:52:00 +01:00
+ if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - fix player loottables running when mob loot gamerule is false
2022-03-29 22:15:26 +02:00
// SPIGOT-5071: manually add player loot tables (SPIGOT-5195 - ignores keepInventory rule)
2022-06-08 15:36:56 +02:00
this.dropFromLootTable(damageSource, this.lastHurtByPlayerTime > 0);
2022-03-29 22:15:26 +02:00
for (org.bukkit.inventory.ItemStack item : this.drops) {
loot.add(item);
}
this.drops.clear(); // SPIGOT-5188: make sure to clear
2024-01-18 18:52:00 +01:00
+ } // Paper - fix player loottables running when mob loot gamerule is false
2022-03-29 22:15:26 +02:00
Component defaultMessage = this.getCombatTracker().getDeathMessage();