From d7d0f241ff3c04a61a4ed8a7d9118afe0d2e67ad Mon Sep 17 00:00:00 2001
From: Eloraam <jen@elaan.com>
Date: Thu, 22 Dec 2011 20:11:38 +0000
Subject: [PATCH] Another mapping update.

---
 forge/conf/methods.csv                                        | 4 ++--
 .../minecraft_server/net/minecraft/src/BlockCrops.java.patch  | 2 +-
 .../minecraft_server/net/minecraft/src/BlockSnow.java.patch   | 2 +-
 .../net/minecraft/src/EntityPlayer.java.patch                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv
index 07bd11585..6d6c35985 100644
--- a/forge/conf/methods.csv
+++ b/forge/conf/methods.csv
@@ -778,7 +778,7 @@
 "func_22329_a","func_22329_a","a","(III)I","(III)I","PathPoint","mo","net/minecraft/src","0"
 "func_1180_a","distanceTo","a","(LPathPoint;)F","(Lmo;)F","PathPoint","mo","net/minecraft/src","0"
 "func_1179_a","isAssigned","a","()Z","()Z","PathPoint","mo","net/minecraft/src","0"
-"func_35374_a","func_35374_a","a","(F)V","(F)V","ContainerCreative","afp","net/minecraft/src","0"
+"func_35374_a","scrollTo","a","(F)V","(F)V","ContainerCreative","afp","net/minecraft/src","0"
 "func_441_c","setSlimeSize","b","(I)V","(I)V","EntitySlime","aed","net/minecraft/src","0"
 "func_25027_v","getSlimeSize","aF","()I","()I","EntitySlime","aed","net/minecraft/src","0"
 "func_40135_ac","func_40135_ac","ax","()Ljava/lang/String;","()Ljava/lang/String;","EntitySlime","aed","net/minecraft/src","0"
@@ -4164,7 +4164,7 @@
 "func_491_a","playRecord","a","(Ljava/lang/String;III)V","(Ljava/lang/String;III)V","World","fi","net/minecraft/src","1"
 "func_514_a","spawnParticle","a","(Ljava/lang/String;DDDDDD)V","(Ljava/lang/String;DDDDDD)V","World","fi","net/minecraft/src","1"
 "func_27073_a","addLightningBolt","a","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1"
-"func_526_a","entityJoinedWorld","b","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1"
+"func_526_a","spawnEntityInWorld","b","(LEntity;)Z","(Lrn;)Z","World","fi","net/minecraft/src","1"
 "func_479_b","obtainEntitySkin","c","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1"
 "func_531_c","releaseEntitySkin","d","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1"
 "func_22085_d","removePlayerForLogoff","e","(LEntity;)V","(Lrn;)V","World","fi","net/minecraft/src","1"
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch
index 81efe2b35..22eda6818 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch
@@ -40,7 +40,7 @@
 -                float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
 -                EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
 -                entityitem.delayBeforeCanPickup = 10;
--                world.entityJoinedWorld(entityitem);
+-                world.spawnEntityInWorld(entityitem);
 +                tr.add(new ItemStack(Item.seeds));
              }
          }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch
index f167a91cf..d0c8fed8a 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch
@@ -11,7 +11,7 @@
 -        double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
 -        EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
 -        entityitem.delayBeforeCanPickup = 10;
--        world.entityJoinedWorld(entityitem);
+-        world.spawnEntityInWorld(entityitem);
 -        world.setBlockWithNotify(i, j, k, 0);
 +	dropBlockAsItem(world,i,j,k,l,0);
          entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
index 434ec56af..996c18ab5 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
@@ -30,7 +30,7 @@
  
      public void dropPlayerItem(ItemStack itemstack)
 @@ -493,6 +506,8 @@
-         worldObj.entityJoinedWorld(entityitem);
+         worldObj.spawnEntityInWorld(entityitem);
      }
  
 +    /* FORGE: This isnt called anymore