diff --git a/forge/minecraft.patch b/forge/minecraft.patch index 2bc0e3397c..6df7fa30c9 100644 --- a/forge/minecraft.patch +++ b/forge/minecraft.patch @@ -372,11 +372,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool. } 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:20:19.000000000 -0400 -@@ -35,4 +35,5 @@ ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:29:35.000000000 -0400 +@@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; ++ ++ // Added for RedPower subblocks. + public int subHit=0; } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java @@ -1051,11 +1053,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It } 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-04 20:51:17.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:20:24.000000000 -0400 -@@ -35,4 +35,5 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-06 14:29:31.000000000 -0400 +@@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; public Entity entityHit; ++ ++ // Added for RedPower subblocks. + public int subHit=0; } diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java