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-08-31 20:29:50 +02:00
index 25ca370c0b19eca529fc2c980c50e899013f0897..f31eb944465e9011d8aad398eb60bafb44203ad5 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-07-18 10:13:20 +02:00
@@ -959,12 +959,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);
2024-07-06 21:19:14 +02:00
this.dropCustomDeathLoot(this.serverLevel(), damageSource, flag);
loot.addAll(this.drops);
2022-03-29 22:15:26 +02:00
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();