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

cleanup of projectiles

Browse Source
This commit is contained in:
Andrew Ardill
2011-11-29 21:30:37 +11:00
parent a1ad0c0103
commit 9455ff1777
5 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minecraft/server/EntityFishingHook.java
View File

@@ -190,13 +190,11 @@ public class EntityFishingHook extends Entity {
if (movingobjectposition != null) {
if (movingobjectposition.entity != null) {
// CraftBukkit start
// TODO add EntityDamagedByProjectileEvent : fishing hook?
boolean stick;
if (movingobjectposition.entity instanceof EntityLiving) {
org.bukkit.entity.Entity damagee = movingobjectposition.entity.getBukkitEntity();
Projectile projectile = (Projectile) this.getBukkitEntity();
// TODO @see EntityArrow#162
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(projectile, damagee, EntityDamageEvent.DamageCause.PROJECTILE, 0);
this.world.getServer().getPluginManager().callEvent(event);
@@ -204,7 +202,7 @@ public class EntityFishingHook extends Entity {
stick = !projectile.doesBounce();
} else {
// this function returns if the fish should stick in or not, i.e. !bounce
stick = movingobjectposition.entity.damageEntity(DamageSource.projectile((Entity) this, this.owner), event.getDamage());
stick = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.owner), event.getDamage());
}
} else {
stick = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.owner), 0);