OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-19 13:38:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Bleeding] Account for null in EntityDamageEvent handling. Fixes BUKKIT-5317

Browse source 
Damage caused by explosions will return null for the event as of
6588d6f72bbca74bf150de65593ac575b846111b. As such, a null check is
now necessary when handling non-living entity damage events.

By: t00thpick1 <t00thpick1dirko@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2014-01-07 00:25:11 -05:00
parent a4b581ad13
commit ba1adfb79b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -455,8 +455,10 @@ public class CraftEventFactory {
if (!(source instanceof EntityDamageSource)) { if (!(source instanceof EntityDamageSource)) {
return false; return false;
} }
// We don't need to check for null, since EntityDamageSource will always return an event
EntityDamageEvent event = handleEntityDamageEvent(entity, source, damage); EntityDamageEvent event = handleEntityDamageEvent(entity, source, damage);
if (event == null) {
return false;
}
return event.isCancelled() || event.getDamage() == 0; return event.isCancelled() || event.getDamage() == 0;
} }