[Bleeding] Implement EntityShootBowEvent. Thanks Zeerix.

This commit is contained in:
Zeerix
2011-12-28 21:36:02 +01:00
committed by Erik Broes
parent edbb7358fc
commit bcf6440bc4
3 changed files with 136 additions and 2 deletions

View File

@@ -1,6 +1,8 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDeathEvent;
// CraftBukkit end
@@ -76,10 +78,22 @@ public class EntitySkeleton extends EntityMonster {
double d2 = entity.locY + (double) entity.y() - 0.699999988079071D - entityarrow.locY;
float f1 = MathHelper.sqrt(d0 * d0 + d1 * d1) * 0.2F;
this.world.makeSound(this, "random.bow", 1.0F, 1.0F / (this.random.nextFloat() * 0.4F + 0.8F));
this.world.addEntity(entityarrow);
this.world.makeSound(this, "random.bow", 1.0F, 1.0F / (this.random.nextFloat() * 0.4F + 0.8F)); // CraftBukkit - moved down
// this.world.addEntity(entityarrow); // CraftBukkit - moved down
entityarrow.shoot(d0, d2 + (double) f1, d1, 1.6F, 12.0F);
this.attackTicks = 60;
// CraftBukkit start
EntityShootBowEvent event = CraftEventFactory.callEntityShootBowEvent(this, null, entityarrow, 0.5F);
if (event.isCancelled()) {
if (event.getProjectile() != null) {
event.getProjectile().remove();
}
} else if (event.getProjectile() == entityarrow.getBukkitEntity()) {
world.addEntity(entityarrow);
}
this.world.makeSound(this, "random.bow", 1.0F, 1.0F / (this.random.nextFloat() * 0.4F + 0.8F));
// CraftBukkit end
}
this.yaw = (float) (Math.atan2(d1, d0) * 180.0D / 3.1415927410125732D) - 90.0F;

View File

@@ -0,0 +1,99 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.entity.EntityShootBowEvent;
// CraftBukkit end
public class ItemBow extends Item {
public ItemBow(int i) {
super(i);
this.maxStackSize = 1;
this.setMaxDurability(384);
}
public void a(ItemStack itemstack, World world, EntityHuman entityhuman, int i) {
boolean flag = entityhuman.abilities.canInstantlyBuild || EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_INFINITE.id, itemstack) > 0;
if (flag || entityhuman.inventory.c(Item.ARROW.id)) {
int j = this.c(itemstack) - i;
float f = (float) j / 20.0F;
f = (f * f + f * 2.0F) / 3.0F;
if ((double) f < 0.1D) {
return;
}
if (f > 1.0F) {
f = 1.0F;
}
EntityArrow entityarrow = new EntityArrow(world, entityhuman, f * 2.0F);
if (f == 1.0F) {
entityarrow.d = true;
}
int k = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, itemstack);
if (k > 0) {
entityarrow.a(entityarrow.j() + (double) k * 0.5D + 0.5D);
}
int l = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, itemstack);
if (l > 0) {
entityarrow.b(l);
}
if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, itemstack) > 0) {
entityarrow.setOnFire(100);
}
// CraftBukkit start
EntityShootBowEvent event = CraftEventFactory.callEntityShootBowEvent(entityhuman, itemstack, entityarrow, f);
if (event.isCancelled()) {
event.getProjectile().remove();
return;
}
if (event.getProjectile() == entityarrow.getBukkitEntity()) {
world.addEntity(entityarrow);
}
// CraftBukkit end
itemstack.damage(1, entityhuman);
world.makeSound(entityhuman, "random.bow", 1.0F, 1.0F / (c.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
if (!flag) {
entityhuman.inventory.b(Item.ARROW.id);
} else {
entityarrow.fromPlayer = false;
}
}
}
public ItemStack b(ItemStack itemstack, World world, EntityHuman entityhuman) {
return itemstack;
}
public int c(ItemStack itemstack) {
return 72000;
}
public EnumAnimation d(ItemStack itemstack) {
return EnumAnimation.e;
}
public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
if (entityhuman.abilities.canInstantlyBuild || entityhuman.inventory.c(Item.ARROW.id)) {
entityhuman.a(itemstack, this.c(itemstack));
}
return itemstack;
}
public int c() {
return 1;
}
}