PaperMC/CraftBukkit-Patches/0042-Fix-EntityShootBowEvent-with-Skeletons.patch

37 lines
1.5 KiB
Diff
Raw Normal View History

2013-06-21 09:35:08 +02:00
From 786be74a1dcb09d71c6992fa89699dfd084f3aaa Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 15:04:37 +1000
Subject: [PATCH] Fix EntityShootBowEvent with Skeletons
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
2013-06-02 08:47:46 +02:00
index 9494627..dba2257 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
2013-06-02 08:47:46 +02:00
@@ -245,9 +245,21 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.bG()) > 0 || this.getSkeletonType() == 1) {
entityarrow.setOnFire(100);
}
+ // Spigot - Skeletons should throw EntityShootBowEvents
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent( this, this.bG(), entityarrow, 1.6F );
+ if ( event.isCancelled() )
+ {
+ event.getProjectile().remove();
+ return;
+ }
+ if ( event.getProjectile() == entityarrow.getBukkitEntity() )
+ {
+ this.world.addEntity( entityarrow );
+ }
+ // Spigot end
this.makeSound("random.bow", 1.0F, 1.0F / (this.aE().nextFloat() * 0.4F + 0.8F));
2013-06-02 08:47:46 +02:00
- this.world.addEntity(entityarrow);
+ // this.world.addEntity(entityarrow); // Spigot - moved up
}
public int getSkeletonType() {
--
1.8.1.2