mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix entity equipment on cancellation of EntityDeathEvent (#5740)

Browse source
This commit is contained in:
Jake Potrebic 2021-12-08 10:25:57 -08:00 • committed by GitHub
parent 33ea869a65
commit 74fd151adc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 151 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0587-Implement-BlockPreDispenseEvent.patch
View file

@ -17,10 +17,10 @@ index 07d357b5fcb30ed9ff074a196a19de1481fe3738..83ac86b3c1e7b9233f2db8e5488f97c5
tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 419c5bd638230c31dd68ba37174c8057c0229a6a..eda17a60afd6cf03e58e66b2dbfe414b1cfac9d5 100644
index bfc3442e7952e1ec927f3ebdbefba153e7304e19..da0a74415dcaddc3f692106faf11403e27feee80 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1848,5 +1848,11 @@ public class CraftEventFactory {
@@ -1854,5 +1854,11 @@ public class CraftEventFactory {
io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
return event.callEvent();
}