TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 11:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Added code to BendingDamageEvent

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -372,8 +372,10 @@ 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);
if(!event.isCancelled()) {
((LivingEntity) entity).damage(damage, player);
entity.setLastDamageCause(new EntityDamageByEntityEvent(player, entity, DamageCause.CUSTOM, damage));
if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus")) {
@ -381,6 +383,7 @@ public class GeneralMethods {
}
}
}
}
/**
* Deserializes the configuration file "bendingPlayers.yml" of the old

12
src/com/projectkorra/projectkorra/event/BendingDamageEvent.java
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