keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed the permissions on a couple fields in ItemTool.

Browse source
This commit is contained in:
Eloraam 2011-08-27 05:49:09 +00:00
parent aead41197f
commit a6ed5709ef
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
forge/minecraft.patch
View file

@ -1187,7 +1187,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende
int i = entityliving.getItemIcon(itemstack); 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 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_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 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; 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) public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
{ {
itemstack.damageItem(2, 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 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_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 +++ ../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; 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 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_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 @@ @@ -4,6 +4,8 @@
package net.minecraft.src; 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) public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
{ {
itemstack.damageItem(2, 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 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_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 +++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-25 03:16:45.000000000 -0400