diff --git a/minecraft.patch b/minecraft.patch index 24a3ad588e..79010def6c 100644 --- a/minecraft.patch +++ b/minecraft.patch @@ -1187,7 +1187,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende int i = entityliving.getItemIcon(itemstack); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java --- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-08-21 03:48:04.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-21 03:48:05.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-27 01:47:43.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1212,6 +1212,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { itemstack.damageItem(2, entityliving1); +@@ -60,7 +70,7 @@ + } + + private Block blocksEffectiveAgainst[]; +- private float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + protected EnumToolMaterial toolMaterial; + } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java --- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-21 03:48:04.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:48.000000000 -0400 @@ -2965,7 +2975,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It return itemstack; diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java --- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-21 03:48:05.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-21 03:48:05.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-27 01:47:55.000000000 -0400 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -2990,6 +3000,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1) { itemstack.damageItem(2, entityliving1); +@@ -55,7 +65,7 @@ + } + + private Block blocksEffectiveAgainst[]; +- private float efficiencyOnProperMaterial; +- private int damageVsEntity; ++ public float efficiencyOnProperMaterial; ++ public int damageVsEntity; + protected EnumToolMaterial toolMaterial; + } diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java --- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-21 03:48:05.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:45.000000000 -0400