mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Small RedPower-specific patch.
This commit is contained in:
1 parent
07dd048d50
commit
87a9cc96cb
1 file changed
+4
-4
+4
-4
@@ -1214,14 +1214,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.
|
||||
itemstack.damageItem(2, entityliving1);
|
||||
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-21 03:48:05.000000000 -0400
|
||||
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:48.000000000 -0400
|
||||
@@ -35,4 +35,7 @@
|
||||
public int sideHit;
|
||||
public Vec3D hitVec;
|
||||
public Entity entityHit;
|
||||
+
|
||||
+ // Added for RedPower subblocks.
|
||||
+ public int subHit=0;
|
||||
+ public int subHit=-1;
|
||||
}
|
||||
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java
|
||||
--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-08-21 03:48:04.000000000 -0400
|
||||
@@ -2992,14 +2992,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
|
||||
itemstack.damageItem(2, entityliving1);
|
||||
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-21 03:48:05.000000000 -0400
|
||||
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:45.000000000 -0400
|
||||
@@ -35,4 +35,7 @@
|
||||
public int sideHit;
|
||||
public Vec3D hitVec;
|
||||
public Entity entityHit;
|
||||
+
|
||||
+ // Added for RedPower subblocks.
|
||||
+ public int subHit=0;
|
||||
+ public int subHit=-1;
|
||||
}
|
||||
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java
|
||||
--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-21 03:48:05.000000000 -0400
|
||||
|
||||
Reference in new issue
Block a user