mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 11:14:48 +02:00
26 lines
1.3 KiB
Diff
26 lines
1.3 KiB
Diff
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
|
|
index fd785c88b4e269fde577eb7abab3dc1c46365f1f..566da3ef03bd866762d02a7240b92b4f36d793c9 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -846,12 +846,14 @@ public class ServerPlayer extends Player {
|
|
}
|
|
}
|
|
}
|
|
+ if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - preserve this check from vanilla
|
|
// 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
|
|
|
|
Component defaultMessage = this.getCombatTracker().getDeathMessage();
|
|
|