upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mapping updates.

Browse Source
This commit is contained in:
Eloraam committed 2011-12-21 23:09:18 +00:00
1 parent 3f8d830899
commit dd1eb6924d
8 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
+1 -1
View File
@@ -38,7 +38,7 @@
- float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
- entityitem.delayBeforeCanPickup = 10;
- world.entityJoinedWorld(entityitem);
- world.spawnEntityInWorld(entityitem);
+ tr.add(new ItemStack(Item.seeds));
}
}
forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch
+1 -1
View File
@@ -11,7 +11,7 @@
- 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.spawnEntityInWorld(entityitem);
- world.setBlockWithNotify(i, j, k, 0);
+
+ dropBlockAsItem(world,i,j,k,l,0);
forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
+2 -2
View File
@@ -30,7 +30,7 @@
public void dropPlayerItem(ItemStack itemstack)
@@ -548,6 +561,8 @@
worldObj.entityJoinedWorld(entityitem);
worldObj.spawnEntityInWorld(entityitem);
}
+ /* FORGE: This isnt called anymore
@@ -107,7 +107,7 @@
+ return;
+ }
+
if(!damagesource.unblockable() && func_35162_ad())
if(!damagesource.isUnblockable() && func_35162_ad())
{
i = 1 + i >> 1;
@@ -825,7 +898,9 @@
forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
+1 -1
View File
@@ -137,7 +137,7 @@
+ * others.
+ */
+ public boolean isBlockNormalCube(World world, int i, int j, int k) {
+ return blockMaterial.getIsOpaque() && isACube();
+ return blockMaterial.getIsOpaque() && renderAsNormalBlock();
+ }
+
+ /* FORGE: Return true if the block is solid on the given side. This
forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
+1 -1
View File
@@ -109,7 +109,7 @@
+ return;
+ }
+
if(!damagesource.unblockable() && func_35180_G())
if(!damagesource.isUnblockable() && func_35180_G())
{
i = 1 + i >> 1;
@@ -770,7 +843,9 @@
forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
+1 -1
View File
@@ -19,6 +19,6 @@
+ return customBucket;
+ }
+
if(!entityplayer.func_35200_c(i, j, k))
if(!entityplayer.canPlayerEdit(i, j, k))
{
return itemstack;
forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
+2 -2
View File
@@ -12,8 +12,8 @@
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))
- if(!entityplayer.canPlayerEdit(i, j, k))
+ if(entityplayer!=null && !entityplayer.canPlayerEdit(i, j, k))
{
return false;
}
forge/patches/minecraft_server/net/minecraft/src/World.java.patch
+1 -1
View File
@@ -154,7 +154,7 @@
- return false;
- } else
- {
- return block.blockMaterial.getIsOpaque() && block.isACube();
- return block.blockMaterial.getIsOpaque() && block.renderAsNormalBlock();
- }
+ if(block == null) return false;
+ return block.isBlockNormalCube(this,i,j,k);