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

Fixed some strange behavior in snow blocks. Fixed a missing patch checkin.

Browse source
This commit is contained in:
Eloraam 2011-12-21 10:15:38 +00:00
parent f4eec04eba
commit 90a4744130
3 changed files with 72 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch Normal file
View file

@ -0,0 +1,29 @@
--- ../src_base/minecraft/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000
@@ -82,15 +82,8 @@
public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
{
- int i1 = Item.snowball.shiftedIndex;
- float f = 0.7F;
- double d = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.setBlockWithNotify(i, j, k, 0);
+
+ dropBlockAsItem(world,i,j,k,l,0);
entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
}
@@ -101,7 +94,7 @@
public int quantityDropped(Random random)
{
- return 0;
+ return 1;
}
public void updateTick(World world, int i, int j, int k, Random random)

15
forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch Normal file
View file

@ -0,0 +1,15 @@
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerCreative.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerCreative.java 0000-00-00 00:00:00.000000000 -0000
@@ -58,6 +58,12 @@
public boolean onPlayerRightClick(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
{
+ if (itemstack != null) {
+ Item it=itemstack.getItem();
+ if (it.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
+ return true;
+ }
+ }
int i1 = world.getBlockId(i, j, k);
if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
{

28
forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch Normal file
View file

@ -0,0 +1,28 @@
--- ../src_base/minecraft_server/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000
@@ -82,15 +82,7 @@
public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
{
- int i1 = Item.snowball.shiftedIndex;
- float f = 0.7F;
- double d = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
- EntityItem entityitem = new EntityItem(world, (double)i + d, (double)j + d1, (double)k + d2, new ItemStack(i1, 1, 0));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.setBlockWithNotify(i, j, k, 0);
+ dropBlockAsItem(world,i,j,k,l,0);
entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1);
}
@@ -101,7 +93,7 @@
public int quantityDropped(Random random)
{
- return 0;
+ return 1;
}
public void updateTick(World world, int i, int j, int k, Random random)