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

Fixed digging particles.

Browse source
This commit is contained in:
Eloraam 2011-09-26 19:37:28 +00:00
parent 47749d454a
commit d290970b49
1 changed files with 165 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

329
forge/minecraft.patch
View file

@ -1,6 +1,6 @@
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButton.java ../src_work/minecraft/net/minecraft/src/BlockButton.java
--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400
@@ -41,36 +41,36 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -119,8 +119,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButt
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChest.java ../src_work/minecraft/net/minecraft/src/BlockChest.java
--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400
@@ -423,23 +423,23 @@
{
return true;
@ -151,8 +151,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes
return true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor.java ../src_work/minecraft/net/minecraft/src/BlockDoor.java
--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400
@@ -178,7 +178,7 @@
world.setBlockWithNotify(i, j, k, 0);
flag = true;
@ -172,8 +172,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.java ../src_work/minecraft/net/minecraft/src/Block.java
--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,7 @@
package net.minecraft.src;
@ -332,8 +332,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav
{
try
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadder.java ../src_work/minecraft/net/minecraft/src/BlockLadder.java
--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400
@@ -63,6 +63,11 @@
return super.getSelectedBoundingBoxFromPool(world, i, j, k);
}
@ -417,8 +417,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLever.java ../src_work/minecraft/net/minecraft/src/BlockLever.java
--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400
@@ -40,44 +40,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -538,8 +538,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java
--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400
@@ -46,7 +46,8 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -561,8 +561,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail.java ../src_work/minecraft/net/minecraft/src/BlockRail.java
--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400
@@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k)
{
@ -617,8 +617,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java
--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:34.000000000 -0400
@@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -638,8 +638,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
return false;
} else
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java
--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -669,8 +669,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
{
return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorch.java ../src_work/minecraft/net/minecraft/src/BlockTorch.java
--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400
@@ -41,24 +41,24 @@
private boolean func_31032_h(World world, int i, int j, int k)
@ -774,8 +774,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java
--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:34.000000000 -0400
@@ -147,7 +147,7 @@
{
j1--;
@ -811,8 +811,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap
+ public static boolean disableValidation=false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java
--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -1020,8 +1020,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav
for(l = -1; i1 > 0 && l == -1;)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java
--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-26 15:34:24.000000000 -0400
@@ -7,6 +7,9 @@
import java.util.*;
import org.lwjgl.opengl.GL11;
@ -1068,7 +1068,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
tessellator.setBrightness(entityfx.func_35115_a(f));
entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
}
@@ -101,6 +117,20 @@
@@ -101,6 +117,21 @@
tessellator.draw();
}
@ -1081,6 +1081,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
+ tessellator.startDrawingQuads();
+ for (int y = 0; y < entry.effects.size(); y++) {
+ EntityFX entityfx = (EntityFX) entry.effects.get(y);
+ tessellator.setBrightness(entityfx.func_35115_a(f));
+ entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
+ }
+ tessellator.draw();
@ -1089,7 +1090,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
}
public void func_1187_b(Entity entity, float f)
@@ -132,7 +162,12 @@
@@ -132,7 +163,12 @@
{
fxLayers[i].clear();
}
@ -1103,7 +1104,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
}
public void addBlockDestroyEffects(int i, int j, int k, int l, int i1)
@@ -153,7 +188,12 @@
@@ -153,7 +189,12 @@
double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1;
double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1;
int j2 = rand.nextInt(6);
@ -1117,7 +1118,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
}
}
@@ -198,16 +238,48 @@
@@ -198,16 +239,48 @@
{
d = (double)i + block.maxX + (double)f;
}
@ -1168,8 +1169,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
private Random rand;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiving.java ../src_work/minecraft/net/minecraft/src/EntityLiving.java
--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400
@@ -624,7 +624,9 @@
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY);
@ -1182,8 +1183,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv
public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-21 23:00:12.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,10 @@
package net.minecraft.src;
@ -1259,8 +1260,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla
{
if(isPlayerSleeping() || !isEntityAlive())
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRenderer.java ../src_work/minecraft/net/minecraft/src/EntityRenderer.java
--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,7 @@
package net.minecraft.src;
@ -1296,8 +1297,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen
}
renderRainSnow(f);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java
--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-23 19:09:34.000000000 -0400
@@ -5,6 +5,7 @@
package net.minecraft.src;
@ -1326,8 +1327,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion
if(f1 > 0.0F)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java
--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400
@@ -6,6 +6,7 @@
import java.util.HashMap;
@ -1385,8 +1386,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/FurnaceRe
}
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
--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:34.000000000 -0400
@@ -62,7 +62,7 @@
{
return false;
@ -1397,8 +1398,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBlock
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
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400
@@ -6,6 +6,8 @@
import java.util.Random;
@ -1421,8 +1422,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke
{
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
--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 2011-09-23 19:09:34.000000000 -0400
@@ -35,7 +35,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
@ -1433,8 +1434,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.j
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
--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:34.000000000 -0400
@@ -46,7 +46,7 @@
{
i++;
@ -1445,8 +1446,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlint
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
--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:34.000000000 -0400
@@ -21,7 +21,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
@ -1457,8 +1458,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.j
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
--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-23 19:09:34.000000000 -0400
@@ -76,6 +76,13 @@
return 1.0F;
}
@ -1474,8 +1475,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java
{
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
--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400
@@ -50,7 +50,7 @@
return false;
}
@ -1486,8 +1487,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRedst
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
--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400
@@ -52,7 +52,7 @@
i++;
}
@ -1498,8 +1499,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemReed.
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
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-23 19:09:34.000000000 -0400
@@ -5,6 +5,10 @@
package net.minecraft.src;
@ -1541,8 +1542,8 @@ 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
--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400
@@ -24,7 +24,7 @@
{
return false;
@ -1553,8 +1554,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemSeeds
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
--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,8 @@
package net.minecraft.src;
@ -1590,8 +1591,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.
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
--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400
@@ -35,4 +35,7 @@
public int sideHit;
public Vec3D hitVec;
@ -1601,8 +1602,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj
+ 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-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -1620,8 +1621,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
return true;
} else
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,9 @@
package net.minecraft.src;
@ -1678,8 +1679,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,8 @@
// Decompiler options: packimports(3) braces deadcode
@ -1743,8 +1744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlocks.java ../src_work/minecraft/net/minecraft/src/RenderBlocks.java
--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-23 19:09:34.000000000 -0400
@@ -2980,7 +2980,7 @@
colorBlueTopRight *= f27;
int j2 = block.getBlockTexture(blockAccess, i, j, k, 2);
@ -1818,8 +1819,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo
tessellator.setColorOpaque_F(f12 * f, f15 * f1, f18 * f2);
renderSouthFace(block, i, j, k, 38);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEngine.java ../src_work/minecraft/net/minecraft/src/RenderEngine.java
--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-23 19:09:34.000000000 -0400
@@ -128,6 +128,9 @@
}
try
@ -1831,8 +1832,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng
GLAllocation.generateTextureNames(singleIntBuffer);
int i = singleIntBuffer.get(0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlobal.java ../src_work/minecraft/net/minecraft/src/RenderGlobal.java
--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-23 19:09:34.000000000 -0400
@@ -1635,8 +1635,8 @@
}
@ -1856,8 +1857,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo
private boolean occlusionEnabled;
private int cloudOffsetX;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java
--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,10 @@
package net.minecraft.src;
@ -1971,8 +1972,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte
int k1 = Item.itemsList[i].getColorFromDamage(j);
float f = (float)(k1 >> 16 & 0xff) / 255F;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPlayer.java ../src_work/minecraft/net/minecraft/src/RenderPlayer.java
--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,7 @@
package net.minecraft.src;
@ -1998,8 +1999,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla
modelbiped.bipedHead.showModel = i == 0;
modelbiped.bipedHeadwear.showModel = i == 0;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCrafting.java ../src_work/minecraft/net/minecraft/src/SlotCrafting.java
--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -2017,8 +2018,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft
{
ItemStack itemstack1 = craftMatrix.getStackInSlot(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellator.java ../src_work/minecraft/net/minecraft/src/Tessellator.java
--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-23 19:09:34.000000000 -0400
@@ -5,6 +5,7 @@
package net.minecraft.src;
@ -2206,8 +2207,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
+ }
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java
--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400
@@ -196,7 +196,7 @@
{
return false;
@ -2233,8 +2234,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
furnaceItemStacks[2].stackSize++;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntity.java ../src_work/minecraft/net/minecraft/src/TileEntity.java
--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400
@@ -61,6 +61,13 @@
{
}
@ -2250,8 +2251,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
{
TileEntity tileentity = null;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java
--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,7 @@
package net.minecraft.src;
@ -2277,8 +2278,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
}
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.java ../src_work/minecraft/net/minecraft/src/World.java
--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-21 22:59:06.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-23 19:09:32.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-23 19:09:34.000000000 -0400
@@ -336,7 +336,10 @@
public boolean isAirBlock(int i, int j, int k)
@ -2356,8 +2357,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
public Random rand;
public boolean isNewWorld;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,8 @@
package net.minecraft.src;
@ -2434,8 +2435,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend
- }
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockButton.java ../src_work/minecraft_server/net/minecraft/src/BlockButton.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-23 19:09:34.000000000 -0400
@@ -41,36 +41,36 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -2554,8 +2555,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockChest.java ../src_work/minecraft_server/net/minecraft/src/BlockChest.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-23 19:09:34.000000000 -0400
@@ -328,23 +328,23 @@
{
return true;
@ -2586,8 +2587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
return true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-23 19:09:34.000000000 -0400
@@ -167,7 +167,7 @@
world.setBlockWithNotify(i, j, k, 0);
flag = true;
@ -2607,8 +2608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Block.java ../src_work/minecraft_server/net/minecraft/src/Block.java
--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -2750,8 +2751,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{
try
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-23 19:09:34.000000000 -0400
@@ -40,6 +40,11 @@
return super.getCollisionBoundingBoxFromPool(world, i, j, k);
}
@ -2835,8 +2836,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLever.java ../src_work/minecraft_server/net/minecraft/src/BlockLever.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-23 19:09:34.000000000 -0400
@@ -35,44 +35,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@ -2956,8 +2957,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-23 19:09:34.000000000 -0400
@@ -46,7 +46,8 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -2979,8 +2980,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRail.java ../src_work/minecraft_server/net/minecraft/src/BlockRail.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-23 19:09:34.000000000 -0400
@@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k)
{
@ -3035,8 +3036,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-23 19:09:34.000000000 -0400
@@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@ -3056,8 +3057,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
return false;
} else
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -3087,8 +3088,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{
return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-23 19:09:34.000000000 -0400
@@ -36,24 +36,24 @@
private boolean canPlaceTorchOn(World world, int i, int j, int k)
@ -3192,8 +3193,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-23 19:09:34.000000000 -0400
@@ -130,7 +130,7 @@
{
j1--;
@ -3229,8 +3230,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
+ public static boolean disableValidation=false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Chunk.java ../src_work/minecraft_server/net/minecraft/src/Chunk.java
--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -3400,8 +3401,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch
for(l = -1; i1 > 0 && l == -1;)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java
--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-23 19:09:34.000000000 -0400
@@ -600,7 +600,9 @@
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY);
@ -3414,8 +3415,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-23 19:09:34.000000000 -0400
@@ -6,6 +6,10 @@
import java.util.*;
@ -3491,8 +3492,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
{
if(isPlayerSleeping() || !isEntityAlive())
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java
--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -3520,8 +3521,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex
if(f1 > 0.0F)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java
--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-23 19:09:34.000000000 -0400
@@ -6,6 +6,7 @@
import java.util.HashMap;
@ -3579,8 +3580,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Fu
}
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 2011-09-23 19:09:34.000000000 -0400
@@ -62,7 +62,7 @@
{
return false;
@ -3591,8 +3592,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-23 19:09:34.000000000 -0400
@@ -6,6 +6,8 @@
import java.util.Random;
@ -3616,8 +3617,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 2011-09-23 19:09:34.000000000 -0400
@@ -29,7 +29,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
@ -3628,8 +3629,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 2011-09-23 19:09:34.000000000 -0400
@@ -46,7 +46,7 @@
{
i++;
@ -3640,8 +3641,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 2011-09-23 19:09:34.000000000 -0400
@@ -21,7 +21,7 @@
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
@ -3652,8 +3653,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,7 +3,8 @@
// Decompiler options: packimports(3) braces deadcode
@ -3735,8 +3736,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Item.java ../src_work/minecraft_server/net/minecraft/src/Item.java
--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-23 19:09:34.000000000 -0400
@@ -66,6 +66,13 @@
return 1.0F;
}
@ -3752,8 +3753,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 2011-09-23 19:09:34.000000000 -0400
@@ -50,7 +50,7 @@
return false;
}
@ -3764,8 +3765,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 2011-09-23 19:09:34.000000000 -0400
@@ -52,7 +52,7 @@
i++;
}
@ -3776,8 +3777,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 2011-09-23 19:09:34.000000000 -0400
@@ -24,7 +24,7 @@
{
return false;
@ -3788,8 +3789,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-23 19:09:34.000000000 -0400
@@ -4,6 +4,8 @@
package net.minecraft.src;
@ -3825,8 +3826,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
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
--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-23 19:09:34.000000000 -0400
@@ -35,4 +35,7 @@
public int sideHit;
public Vec3D hitVec;
@ -3836,8 +3837,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo
+ 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-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-23 19:09:34.000000000 -0400
@@ -168,12 +168,11 @@
sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
for(int k = 0; k < numBlocksToUpdate; k++)
@ -3854,8 +3855,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Pl
}
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java
--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-23 19:09:34.000000000 -0400
@@ -3,7 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@ -3874,8 +3875,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl
{
ItemStack itemstack1 = craftMatrix.getStackInSlot(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java
--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-23 19:09:34.000000000 -0400
@@ -176,7 +176,7 @@
{
return false;
@ -3901,8 +3902,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti
furnaceItemStacks[2].stackSize++;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/TileEntity.java ../src_work/minecraft_server/net/minecraft/src/TileEntity.java
--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-23 19:09:34.000000000 -0400
@@ -61,6 +61,13 @@
{
}
@ -3918,8 +3919,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti
{
TileEntity tileentity = null;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java
--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-21 22:59:09.000000000 -0400
--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-23 19:09:33.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-23 19:09:34.000000000 -0400
@@ -183,7 +183,11 @@
public boolean isAirBlock(int i, int j, int k)