twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 12:43:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up some events to maintain general style

Browse Source
This commit is contained in:
Andrew Ardill
2011-12-05 19:13:10 +11:00
parent 8363eadcab
commit b1a3aa602a
12 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraft/server/EntityHuman.java
View File

@@ -4,6 +4,7 @@ import java.util.Iterator;
import java.util.List;
// CraftBukkit start
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.entity.CraftItem;
import org.bukkit.craftbukkit.TrigMath;
import org.bukkit.entity.Player;
@@ -591,7 +592,7 @@ public abstract class EntityHuman extends EntityLiving {
org.bukkit.entity.Entity damagee = this.getBukkitEntity();
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, i);
this.world.getServer().getPluginManager().callEvent(event);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled() || event.getDamage() == 0) {
return false;
@@ -779,7 +780,7 @@ public abstract class EntityHuman extends EntityLiving {
org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, i);
this.world.getServer().getPluginManager().callEvent(event);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled() || event.getDamage() == 0) {
return;