Added code to BendingDamageEvent

This commit is contained in:
Matt 2016-02-19 18:12:20 -05:00
parent 91de6ce20d
commit 23e03f310f
2 changed files with 19 additions and 6 deletions

View file

@ -372,12 +372,15 @@ public class GeneralMethods {
EntityBendingDeathEvent event = new EntityBendingDeathEvent(entity, player, damage, ability);
Bukkit.getServer().getPluginManager().callEvent(event);
}
BendingDamageEvent event = new BendingDamageEvent();
BendingDamageEvent event = new BendingDamageEvent(damage);
Bukkit.getServer().getPluginManager().callEvent(event);
((LivingEntity) entity).damage(damage, player);
entity.setLastDamageCause(new EntityDamageByEntityEvent(player, entity, DamageCause.CUSTOM, damage));
if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus")) {
NCPExemptionManager.unexempt(player);
if(!event.isCancelled()) {
((LivingEntity) entity).damage(damage, player);
entity.setLastDamageCause(new EntityDamageByEntityEvent(player, entity, DamageCause.CUSTOM, damage));
if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus")) {
NCPExemptionManager.unexempt(player);
}
}
}
}

View file

@ -8,9 +8,19 @@ public class BendingDamageEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private double damage;
public BendingDamageEvent() {
public BendingDamageEvent(double damage) {
this.cancelled = false;
this.damage = damage;
}
public double getDamage() {
return damage;
}
public void setDamage(double damage) {
this.damage = damage;
}
@Override