Implementation of the EntityDamage*Events.

Many files were added to enable the correct hooking of these events, and a new
event EntityDamageByProjectileEvent. EntityDamageByProjectileEvent adds the
ability to get the projectile entity (such as an egg) and also set if the
projectile 'bounces'. Only two projectiles currently respond to bouncing, Arrow
and Fish - were if the fish bounces it means the fish is not hooked. Bouncing
is independent of any damage caused via the event. In addition, the changes to
EntityDamageEvent that enable setting post-event damage were implemented in all
hooks.

Finally, a bug in CraftArrow was fixed, where the constructor was not declared public.
This commit is contained in:
Andrew Ardill
2011-01-12 16:48:19 +11:00
committed by Erik Broes
parent 807de6ee22
commit ceaf94d5bb
12 changed files with 1784 additions and 20 deletions

View File

@@ -0,0 +1,111 @@
package net.minecraft.server;
import java.util.Random;
//CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
//CraftBukkit end
public class EntityMobs extends EntityCreature implements IMobs {
protected int c;
public EntityMobs(World world) {
super(world);
c = 2;
aZ = 20;
}
public void o() {
float f = b(1.0F);
if (f > 0.5F) {
bw += 2;
}
super.o();
}
public void b_() {
super.b_();
if (l.k == 0) {
q();
}
}
protected Entity l() {
EntityPlayer entityplayer = l.a(((Entity) (this)), 16D);
if (entityplayer != null && i(((Entity) (entityplayer)))) {
return ((Entity) (entityplayer));
} else {
return null;
}
}
public boolean a(Entity entity, int i) {
if (super.a(entity, i)) {
if (j == entity || k == entity) {
return true;
}
if (entity != this) {
d = entity;
}
return true;
} else {
return false;
}
}
protected void a(Entity entity, float f) {
if ((double) f < 2.5D && entity.z.e > z.b && entity.z.b < z.e) {
bf = 20;
// CraftBukkit start
if(entity instanceof EntityLiving) {
CraftServer server = ((WorldServer) l).getServer();
CraftEntity damagee = new CraftLivingEntity(server, (EntityLiving) entity);
CraftEntity damager = new CraftLivingEntity(server, this);
EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, c);
server.getPluginManager().callEvent(edbee);
if (!edbee.isCancelled()){
entity.a(((Entity) (null)), edbee.getDamage());
}
} else {
entity.a(((Entity) (this)), c);
}
// CraftBukkit end
}
}
protected float a(int i, int j, int k) {
return 0.5F - l.l(i, j, k);
}
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
}
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
}
public boolean b() {
int i = MathHelper.b(p);
int j = MathHelper.b(z.b);
int k = MathHelper.b(r);
if (l.a(EnumSkyBlock.a, i, j, k) > W.nextInt(32)) {
return false;
} else {
int i1 = l.j(i, j, k);
return i1 <= W.nextInt(8) && super.b();
}
}
}