[ci skip] Add more patch identifying comments, merge related patches
This commit is contained in:
@@ -12,11 +12,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
} else if (source.is(DamageTypes.SONIC_BOOM)) {
|
||||
cause = DamageCause.SONIC_BOOM;
|
||||
}
|
||||
+ // Paper start - fix handle of Falling Blocks
|
||||
+ // Paper start - fix falling block handling
|
||||
+ else if (source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_BLOCK) || source.is(DamageTypes.FALLING_ANVIL)) {
|
||||
+ cause = DamageCause.FALLING_BLOCK;
|
||||
+ }
|
||||
+ // Paper end
|
||||
+ // Paper end - fix falling block handling
|
||||
|
||||
return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
|
||||
} else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) {
|
||||
|
||||
Reference in New Issue
Block a user