Skip to content

Fix loot tables being reset before death event #13886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roro1506HD wants to merge 7 commits into
base: main
Choose a base branch
from
+19 −6
Open

Fix loot tables being reset before death event #13886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39d3961
fix: loot tables being reset before death event
roro1506HD May 15, 2026
a59417a
fix: loot tables still being reset when death event is cancelled
roro1506HD May 15, 2026
708f683
chore: make patch a little more readable
roro1506HD May 15, 2026
0cdcfc5
chore: add missing override annotation
roro1506HD May 15, 2026
d3f941b
chore: add missing override annotation for chested horse
roro1506HD May 15, 2026
6172b68
fix: check event cancellation before the callback
roro1506HD May 16, 2026
211f557
fix: call super method for chested horse callback
roro1506HD May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@
+ killer.awardKillScore(this, source);
+ }
+ }); // Paper end
+ this.postDeathDropItems(deathEvent); // Paper
+ if (!deathEvent.isCancelled()) this.postDeathEventCallback(); // Paper - post death event logic
+ this.drops = new java.util.ArrayList<>();
+ // this.dropEquipment(level); // CraftBukkit - moved up
+ // CraftBukkit end
Expand All @@ -941,7 +941,7 @@

protected void dropEquipment(final ServerLevel level) {
}
+ protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled
+ protected void postDeathEventCallback() {} // Paper - method for post death logic that must be ran if the event isn't cancelled

- protected void dropExperience(final ServerLevel level, final @Nullable Entity killer) {
+ public int getExpReward(final ServerLevel level, final @Nullable Entity killer) { // CraftBukkit
Expand Down
13 changes: 12 additions & 1 deletion paper-server/patches/sources/net/minecraft/world/entity/Mob.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
this.dropChances = input.read("drop_chances", DropChances.CODEC).orElse(DropChances.DEFAULT);
this.readLeashData(input);
this.homeRadius = input.getIntOr("home_radius", -1);
@@ -401,6 +_,13 @@
@@ -401,11 +_,24 @@
this.lootTable = input.read("DeathLootTable", LootTable.KEY_CODEC);
this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L);
this.setNoAi(input.getBooleanOr("NoAI", false));
Expand All @@ -122,6 +122,17 @@
}

@Override
protected void dropFromLootTable(final ServerLevel level, final DamageSource source, final boolean playerKilled) {
super.dropFromLootTable(level, source, playerKilled);
+ // Paper start - delay loot table removal to after death event
+ }
+ @Override
+ protected void postDeathEventCallback() {
+ if (!this.shouldDropLoot((ServerLevel) this.level())) return; // This callback can only be ran if the level is a ServerLevel
+ // Paper end - delay loot table removal to after death event
this.lootTable = Optional.empty();
}

@@ -465,6 +_,11 @@
for (ItemEntity entity : this.level()
.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(pickupReach.getX(), pickupReach.getY(), pickupReach.getZ()))) {
Expand Down
8 changes: 5 additions & 3 deletions .../patches/sources/net/minecraft/world/entity/animal/equine/AbstractChestedHorse.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
--- a/net/minecraft/world/entity/animal/equine/AbstractChestedHorse.java
+++ b/net/minecraft/world/entity/animal/equine/AbstractChestedHorse.java
@@ -75,6 +_,12 @@
@@ -75,6 +_,14 @@
super.dropEquipment(level);
if (this.hasChest()) {
this.spawnAtLocation(level, Blocks.CHEST);
+ // Paper start - moved to post death logic
+ }
+ }
+ protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {
+ if (this.hasChest() && !event.isCancelled()) {
+ @Override
+ protected void postDeathEventCallback() {
Comment thread
roro1506HD marked this conversation as resolved.
+ super.postDeathEventCallback();
+ if (this.hasChest()) {
+ // Paper end - moved to post death logic
this.setChest(false);
}
Expand Down
Loading