Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added fall damage event.

Browse Source
This commit is contained in:
sk89q 2011-01-20 00:10:47 -08:00
parent 11de6b91da
commit d3e8f792e5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/EntityLiving.java
View File

@ -7,6 +7,9 @@ import java.util.Random;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.entity.CraftLivingEntity;
//CraftBukkit end //CraftBukkit end
import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
public abstract class EntityLiving extends Entity { public abstract class EntityLiving extends Entity {
@ -420,7 +423,18 @@ public abstract class EntityLiving extends Entity {
int k = (int) Math.ceil(f1 - 3F); int k = (int) Math.ceil(f1 - 3F);
if (k > 0) { if (k > 0) {
// CraftBukkit start
CraftServer server = ((WorldServer) l).getServer();
org.bukkit.entity.Entity victim = this.getBukkitEntity();
DamageCause damageType = EntityDamageEvent.DamageCause.FALL;
EntityDamageEvent evt = new EntityDamageEvent(victim, damageType, k);
server.getPluginManager().callEvent(evt);
// CraftBukkit end
if (!evt.isCancelled()){
a(((Entity) (null)), k); a(((Entity) (null)), k);
}
int l = this.l.a(MathHelper.b(p), MathHelper.b(q - 0.20000000298023224D - (double) H), MathHelper.b(r)); int l = this.l.a(MathHelper.b(p), MathHelper.b(q - 0.20000000298023224D - (double) H), MathHelper.b(r));
if (l > 0) { if (l > 0) {