Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4.4.

Browse Source
This commit is contained in:
Travis Watkins
2012-11-06 06:05:28 -06:00
parent a0c3b4f9d1
commit 7f7192f8fd
169 changed files with 3295 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ public class EntityEgg extends EntityProjectile {
protected void a(MovingObjectPosition movingobjectposition) {
if (movingobjectposition.entity != null) {
movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.shooter), 0);
movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.getShooter()), 0);
}
// CraftBukkit start
@@ -35,8 +35,9 @@ public class EntityEgg extends EntityProjectile {
EntityType hatchingType = EntityType.CHICKEN;
if (this.shooter instanceof EntityPlayer) {
Player player = (this.shooter == null) ? null : (Player) this.shooter.getBukkitEntity();
Entity shooter = this.getShooter();
if (shooter instanceof EntityPlayer) {
Player player = (shooter == null) ? null : (Player) shooter.getBukkitEntity();
PlayerEggThrowEvent event = new PlayerEggThrowEvent(player, (org.bukkit.entity.Egg) this.getBukkitEntity(), hatching, (byte) numHatching, hatchingType);
this.world.getServer().getPluginManager().callEvent(event);