Merge branch 'master' into minestrike-update
This commit is contained in:
commit
e3c22b356b
@ -187,8 +187,7 @@ public class DamageManager extends MiniPlugin
|
|||||||
|
|
||||||
public void NewDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile proj, Location knockbackOrigin,
|
public void NewDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile proj, Location knockbackOrigin,
|
||||||
DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor,
|
DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor,
|
||||||
String source,
|
String source, String reason)
|
||||||
String reason)
|
|
||||||
{
|
{
|
||||||
NewDamageEvent(damagee, damager, proj, knockbackOrigin, cause, damage, knockback, ignoreRate, ignoreArmor, source,
|
NewDamageEvent(damagee, damager, proj, knockbackOrigin, cause, damage, knockback, ignoreRate, ignoreArmor, source,
|
||||||
reason, false);
|
reason, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user