1 files changed, 11 insertions, 14 deletions

diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
index 50441dbb..4a0dbf1b 100644
--- a/src/main/java/net/minecraft/server/EntityEgg.java
+++ b/src/main/java/net/minecraft/server/EntityEgg.java
@@ -79,11 +79,11 @@ public class EntityEgg extends Entity {
         this.h = 0;
     }
 
-    public void m_() {
-        this.bo = this.locX;
-        this.bp = this.locY;
-        this.bq = this.locZ;
-        super.m_();
+    public void s_() {
+        this.bE = this.locX;
+        this.bF = this.locY;
+        this.bG = this.locZ;
+        super.s_();
         if (this.a > 0) {
             --this.a;
         }
@@ -128,13 +128,13 @@ public class EntityEgg extends Entity {
             for (int j = 0; j < list.size(); ++j) {
                 Entity entity1 = (Entity) list.get(j);
 
-                if (entity1.l_() && (entity1 != this.thrower || this.i >= 5)) {
+                if (entity1.r_() && (entity1 != this.thrower || this.i >= 5)) {
                     float f = 0.3F;
                     AxisAlignedBB axisalignedbb = entity1.boundingBox.b((double) f, (double) f, (double) f);
                     MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1);
 
                     if (movingobjectposition1 != null) {
-                        double d1 = vec3d.a(movingobjectposition1.f);
+                        double d1 = vec3d.b(movingobjectposition1.f);
 
                         if (d1 < d0 || d0 == 0.0D) {
                             entity = entity1;
@@ -168,10 +168,10 @@ public class EntityEgg extends Entity {
                         stick = !projectile.doesBounce();
                     } else {
                         // this function returns if the egg should stick in or not, i.e. !bounce
-                        stick = movingobjectposition.entity.damageEntity(this, event.getDamage());
+                        stick = movingobjectposition.entity.damageEntity(DamageSource.a(this, this), event.getDamage());
                     }
                 } else {
-                    stick = movingobjectposition.entity.damageEntity(this.thrower, 0);
+                    stick = movingobjectposition.entity.damageEntity(DamageSource.a(this, this.thrower), 0);
                 }
 
                 if (stick) {
@@ -244,9 +244,6 @@ public class EntityEgg extends Entity {
                         case WOLF:
                             entity = new EntityWolf(this.world);
                             break;
-                        case MONSTER:
-                            entity = new EntityMonster(this.world);
-                            break;
                         default:
                             entity = new EntityChicken(this.world);
                             break;
@@ -297,7 +294,7 @@ public class EntityEgg extends Entity {
         float f2 = 0.99F;
         float f3 = 0.03F;
 
-        if (this.ad()) {
+        if (this.ao()) {
             for (int i1 = 0; i1 < 4; ++i1) {
                 float f4 = 0.25F;
 
@@ -332,7 +329,7 @@ public class EntityEgg extends Entity {
         this.f = nbttagcompound.c("inGround") == 1;
     }
 
-    public void b(EntityHuman entityhuman) {
+    public void a_(EntityHuman entityhuman) {
         if (this.f && this.thrower == entityhuman && this.a <= 0 && entityhuman.inventory.pickup(new ItemStack(Item.ARROW, 1))) {
             this.world.makeSound(this, "random.pop", 0.2F, ((this.random.nextFloat() - this.random.nextFloat()) * 0.7F + 1.0F) * 2.0F);
             entityhuman.receive(this, 1);