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

Added a fix for onItemUse regression.

This commit is contained in:
Eloraam 2011-09-22 10:12:05 +00:00
parent ed7c343647
commit 47749d454a
1 changed files with 168 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
forge/minecraft.patch
View File

@ -1384,6 +1384,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRe
+ private Map metaSmeltingList;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock.java ../src_work/minecraft/net/minecraft/src/ItemBlock.java
--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-22 06:08:18.000000000 -0400
@@ -62,7 +62,7 @@
{
return false;
}
- if(!entityplayer.func_35190_e(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400
@ -1408,6 +1420,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke
if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
{
world.setBlockWithNotify(i, j, k, 0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.java ../src_work/minecraft/net/minecraft/src/ItemDye.java
--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-22 06:02:44.000000000 -0400
@@ -35,7 +35,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
{
- if(!entityplayer.func_35190_e(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java
--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-22 06:02:54.000000000 -0400
@@ -46,7 +46,7 @@
{
i++;
}
- if(!entityplayer.func_35190_e(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.java ../src_work/minecraft/net/minecraft/src/ItemHoe.java
--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-22 06:03:24.000000000 -0400
@@ -21,7 +21,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
{
- if(!entityplayer.func_35190_e(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java ../src_work/minecraft/net/minecraft/src/Item.java
--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400
@ -1425,6 +1473,30 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
{
return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedstone.java ../src_work/minecraft/net/minecraft/src/ItemRedstone.java
--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-22 06:03:35.000000000 -0400
@@ -50,7 +50,7 @@
return false;
}
}
- if(!entityplayer.func_35190_e(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed.java ../src_work/minecraft/net/minecraft/src/ItemReed.java
--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-22 06:04:20.000000000 -0400
@@ -52,7 +52,7 @@
i++;
}
}
- if(!entityplayer.func_35190_e(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-21 22:59:09.000000000 -0400
@ -1468,6 +1540,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende
}
Tessellator tessellator = Tessellator.instance;
int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds.java ../src_work/minecraft/net/minecraft/src/ItemSeeds.java
--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-22 06:03:52.000000000 -0400
@@ -24,7 +24,7 @@
{
return false;
}
- if(!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k))
+ if(entityplayer!=null && (!entityplayer.func_35190_e(i, j, k) || !entityplayer.func_35190_e(i, j + 1, k)))
{
return false;
}
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-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400
@ -3494,6 +3578,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Fu
+ private Map metaSmeltingList;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-22 06:08:38.000000000 -0400
@@ -62,7 +62,7 @@
{
return false;
}
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-21 22:59:09.000000000 -0400
@ -3519,6 +3615,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
if(!entityplayer.func_35200_c(i, j, k))
{
return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemDye.java ../src_work/minecraft_server/net/minecraft/src/ItemDye.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-22 06:04:56.000000000 -0400
@@ -29,7 +29,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
{
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-22 06:05:03.000000000 -0400
@@ -46,7 +46,7 @@
{
i++;
}
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-22 06:05:12.000000000 -0400
@@ -21,7 +21,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
{
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-21 22:59:09.000000000 -0400
@ -3619,6 +3751,42 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
{
return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-22 06:05:19.000000000 -0400
@@ -50,7 +50,7 @@
return false;
}
}
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemReed.java ../src_work/minecraft_server/net/minecraft/src/ItemReed.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-22 06:05:35.000000000 -0400
@@ -52,7 +52,7 @@
i++;
}
}
- if(!entityplayer.func_35200_c(i, j, k))
+ if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
{
return false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-22 06:05:28.000000000 -0400
@@ -24,7 +24,7 @@
{
return false;
}
- if(!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k))
+ if(entityplayer!=null && (!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k)))
{
return false;
}
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-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-21 22:59:09.000000000 -0400