Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 05:25:42 +01:00
Code Issues Projects Releases Wiki Activity

moved firing of ProjectileHitEvent for mojang projectiles

Browse Source
This commit is contained in:
sunkid 2011-12-27 10:31:00 -08:00 committed by Erik Broes
parent fb8a45b648
commit 5adcf526ab
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/EntityEgg.java
View File

@ -27,9 +27,6 @@ public class EntityEgg extends EntityProjectile {
protected void a(MovingObjectPosition movingobjectposition) { protected void a(MovingObjectPosition movingobjectposition) {
// CraftBukkit start // CraftBukkit start
ProjectileHitEvent phe = new ProjectileHitEvent((Projectile) this.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(phe);
if (movingobjectposition.entity != null) { if (movingobjectposition.entity != null) {
boolean stick; boolean stick;
if (movingobjectposition.entity instanceof EntityLiving) { if (movingobjectposition.entity instanceof EntityLiving) {

11
src/main/java/net/minecraft/server/EntityProjectile.java
View File

@ -1,6 +1,11 @@
package net.minecraft.server; package net.minecraft.server;
import java.util.List; import java.util.List;
// CraftBukkit start
import org.bukkit.Bukkit;
import org.bukkit.entity.Projectile;
import org.bukkit.event.entity.ProjectileHitEvent;
// CraftBukkit end
public abstract class EntityProjectile extends Entity { public abstract class EntityProjectile extends Entity {
@ -149,6 +154,12 @@ public abstract class EntityProjectile extends Entity {
if (movingobjectposition != null) { if (movingobjectposition != null) {
this.a(movingobjectposition); this.a(movingobjectposition);
// CraftBukkit start
if (this.dead) {
ProjectileHitEvent hitEvent = new ProjectileHitEvent((Projectile) this.getBukkitEntity());
Bukkit.getPluginManager().callEvent(hitEvent);
}
// CraftBukkit end
} }
this.locX += this.motX; this.locX += this.motX;

3
src/main/java/net/minecraft/server/EntitySnowball.java
View File

@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
// CraftBukkit end // CraftBukkit end
public class EntitySnowball extends EntityProjectile { public class EntitySnowball extends EntityProjectile {
@ -31,8 +30,6 @@ public class EntitySnowball extends EntityProjectile {
b0 = 3; b0 = 3;
} }
// CraftBukkit start // CraftBukkit start
ProjectileHitEvent hitEvent = new ProjectileHitEvent((Projectile) this.getBukkitEntity());
Bukkit.getPluginManager().callEvent(hitEvent);
final Entity movingEntity = movingobjectposition.entity; final Entity movingEntity = movingobjectposition.entity;
boolean stick = false; boolean stick = false;