twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 04:05:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Events should be present tense, not paste tense.

Browse Source
This commit is contained in:
Erik Broes
2011-01-15 21:26:05 +01:00
parent 2184d240db
commit 8c8f53fd44
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/Explosion.java
View File

@@ -5,9 +5,9 @@ import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamagedByBlockEvent;
import org.bukkit.event.entity.EntityDamagedByEntityEvent;
import org.bukkit.event.entity.EntityDamagedEvent;
import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end
import java.util.*;
@@ -123,7 +123,7 @@ public class Explosion {
if (e == null) { // Block explosion
// Craftbukkit TODO: get the x/y/z of the tnt block?
EntityDamagedByBlockEvent edbbe = new EntityDamagedByBlockEvent(null, damagee, EntityDamagedEvent.DamageCause.BLOCK_EXPLOSION, damage);
EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(null, damagee, EntityDamageEvent.DamageCause.BLOCK_EXPLOSION, damage);
servr.getPluginManager().callEvent(edbbe);
if(!edbbe.isCancelled()) entity.a(e, damage);
} else {
@@ -134,7 +134,7 @@ public class Explosion {
} else if (e instanceof EntityLiving) {
damager = new CraftLivingEntity(servr, (EntityLiving) e);
}
EntityDamagedByEntityEvent edbbe = new EntityDamagedByEntityEvent(damager, damagee, EntityDamagedEvent.DamageCause.ENTITY_EXPLOSION, damage);
EntityDamageByEntityEvent edbbe = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage);
servr.getPluginManager().callEvent(edbbe);
if (!edbbe.isCancelled()) {