TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

use a damage event only for setting last damage cause (#649)

Browse source 
Firing this tricks other plugins into believing this entity was damaged.

In addition, Entity#damage also fires a damage event, so no need to fire a duplicate one.
This commit is contained in:
RoboMWM 2016-11-29 14:08:19 -08:00 committed by Christopher Martin
parent cbb3581a12
commit 3613ca6577
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/projectkorra/projectkorra/util/DamageHandler.java
View file

@ -58,12 +58,8 @@ public class DamageHandler {
} }
EntityDamageByEntityEvent finalEvent = new EntityDamageByEntityEvent(source, entity, cause, damage); EntityDamageByEntityEvent finalEvent = new EntityDamageByEntityEvent(source, entity, cause, damage);
Bukkit.getServer().getPluginManager().callEvent(finalEvent); ((LivingEntity) entity).damage(damage, source);
if (!finalEvent.isCancelled()) { entity.setLastDamageCause(finalEvent);
damage = finalEvent.getDamage();
((LivingEntity) entity).damage(damage, source);
entity.setLastDamageCause(finalEvent);
}
if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus") && source != null) { if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus") && source != null) {
NCPExemptionManager.unexempt(source); NCPExemptionManager.unexempt(source);