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

SPIGOT-6639: During an EntityDamageEvent with damage from blocks, damaging any entity throws an error

Browse source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2022-01-23 09:06:06 +11:00
parent a8b86ea421
commit cf4feec6b5
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -893,7 +893,12 @@ public class CraftEventFactory {
} else if (source == DamageSource.LAVA) { } else if (source == DamageSource.LAVA) {
EntityDamageEvent event = (new EntityDamageByBlockEvent(blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, modifiers, modifierFunctions)); EntityDamageEvent event = (new EntityDamageByBlockEvent(blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, modifiers, modifierFunctions));
event.setCancelled(cancelled); event.setCancelled(cancelled);
Block damager = blockDamage;
blockDamage = null; // SPIGOT-6639: Clear blockDamage to allow other entity damage during event call
callEvent(event); callEvent(event);
blockDamage = damager; // SPIGOT-6639: Re-set blockDamage so that other entities which are also getting damaged have the right cause
if (!event.isCancelled()) { if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event); event.getEntity().setLastDamageCause(event);
} else { } else {
@ -916,7 +921,11 @@ public class CraftEventFactory {
} }
EntityDamageEvent event = new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions); EntityDamageEvent event = new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions);
event.setCancelled(cancelled); event.setCancelled(cancelled);
blockDamage = null; // SPIGOT-6639: Clear blockDamage to allow other entity damage during event call
callEvent(event); callEvent(event);
blockDamage = damager; // SPIGOT-6639: Re-set blockDamage so that other entities which are also getting damaged have the right cause
if (!event.isCancelled()) { if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event); event.getEntity().setLastDamageCause(event);
} else { } else {