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

More MCP mapping fixes.

Browse Source
This commit is contained in:
Eloraam committed 2011-09-22 03:01:10 +00:00
1 parent a386d0a8dc
commit ed7c343647
1 file changed
+141 -146
Download Patch File Download Diff File Expand all files Collapse all files
forge/minecraft.patch
+141 -146
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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -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-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-21 03:50:55.000000000 -0400
--- ../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
@@ -4,6 +4,7 @@
package net.minecraft.src;
@@ -188,14 +188,14 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav
{
- return iblockaccess.getBrightness(i, j, k, lightValue[blockID]);
+ return iblockaccess.getBrightness(i, j, k,
+ getLightValue(iblockaccess,i,j,k));
+ getLightValue(iblockaccess,i,j,k));
}
public int func_35275_c(IBlockAccess iblockaccess, int i, int j, int k)
public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k)
{
- return iblockaccess.getLightBrightnessFromSunlight(i, j, k, lightValue[blockID]);
+ return iblockaccess.getLightBrightnessFromSunlight(i, j, k,
+ getLightValue(iblockaccess,i,j,k));
- return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]);
+ return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k,
+ getLightValue(iblockaccess,i,j,k));
}
public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
@@ -331,11 +331,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav
static Class _mthclass$(String s)
{
try
Only in ../src_work/minecraft/net/minecraft/src: Block.java.orig
Only in ../src_work/minecraft/net/minecraft/src: Block.java.rej
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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -63,6 +63,11 @@
return super.getSelectedBoundingBoxFromPool(world, i, j, k);
}
@@ -419,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -40,44 +40,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@@ -540,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -46,7 +46,8 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -563,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k)
{
@@ -619,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -640,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -671,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -41,24 +41,24 @@
private boolean func_31032_h(World world, int i, int j, int k)
@@ -776,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -147,7 +147,7 @@
{
j1--;
@@ -813,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-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-19 16:32:53.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1022,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-19 16:36:34.000000000 -0400
--- ../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
@@ -7,6 +7,9 @@
import java.util.*;
import org.lwjgl.opengl.GL11;
@@ -1169,11 +1167,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
private RenderEngine renderer;
private Random rand;
}
Only in ../src_work/minecraft/net/minecraft/src: EffectRenderer.java.orig
Only in ../src_work/minecraft/net/minecraft/src: EffectRenderer.java.rej
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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -624,7 +624,9 @@
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY);
@@ -1186,8 +1182,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-19 16:38:04.000000000 -0400
--- ../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
@@ -4,6 +4,10 @@
package net.minecraft.src;
@@ -1227,13 +1223,13 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla
+ {
+ f /= 5F;
+ }
+ if(func_35160_a(Potion.potionDigSpeed))
+ if(isPotionActive(Potion.potionDigSpeed))
+ {
+ f *= 1.0F + (float)(func_35167_b(Potion.potionDigSpeed).func_35801_c() + 1) * 0.2F;
+ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F;
+ }
+ if(func_35160_a(Potion.potionDigSlow))
+ if(isPotionActive(Potion.potionDigSlow))
+ {
+ f *= 1.0F - (float)(func_35167_b(Potion.potionDigSlow).func_35801_c() + 1) * 0.2F;
+ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F;
+ }
+ return f;
+ }
@@ -1263,8 +1259,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,7 @@
package net.minecraft.src;
@@ -1300,8 +1296,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-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -5,6 +5,7 @@
package net.minecraft.src;
@@ -1330,8 +1326,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 2011-09-20 21:01:53.000000000 -0400
--- ../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
@@ -6,6 +6,7 @@
import java.util.HashMap;
@@ -1389,8 +1385,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/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -6,6 +6,8 @@
import java.util.Random;
@@ -1413,8 +1409,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/Item.java ../src_work/minecraft/net/minecraft/src/Item.java
--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -76,6 +76,13 @@
return 1.0F;
}
@@ -1430,8 +1426,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/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -5,6 +5,10 @@
package net.minecraft.src;
@@ -1473,8 +1469,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/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,8 @@
package net.minecraft.src;
@@ -1510,8 +1506,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -35,4 +35,7 @@
public int sideHit;
public Vec3D hitVec;
@@ -1521,8 +1517,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1540,8 +1536,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,9 @@
package net.minecraft.src;
@@ -1598,8 +1594,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,6 +3,8 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1663,8 +1659,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-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -2980,7 +2980,7 @@
colorBlueTopRight *= f27;
int j2 = block.getBlockTexture(blockAccess, i, j, k, 2);
@@ -1738,8 +1734,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -128,6 +128,9 @@
}
try
@@ -1751,8 +1747,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -1635,8 +1635,8 @@
}
@@ -1776,8 +1772,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,10 @@
package net.minecraft.src;
@@ -1891,8 +1887,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,7 @@
package net.minecraft.src;
@@ -1918,8 +1914,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1937,8 +1933,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -5,6 +5,7 @@
package net.minecraft.src;
@@ -2126,8 +2122,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:58:51.000000000 -0400
--- ../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
@@ -196,7 +196,7 @@
{
return false;
@@ -2153,8 +2149,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -61,6 +61,13 @@
{
}
@@ -2170,8 +2166,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-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,7 @@
package net.minecraft.src;
@@ -2197,8 +2193,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-19 16:32:51.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -336,7 +336,10 @@
public boolean isAirBlock(int i, int j, int k)
@@ -2276,8 +2272,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-19 16:32:52.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,8 @@
package net.minecraft.src;
@@ -2354,8 +2350,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -41,36 +41,36 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@@ -2474,8 +2470,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -328,23 +328,23 @@
{
return true;
@@ -2506,8 +2502,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -167,7 +167,7 @@
world.setBlockWithNotify(i, j, k, 0);
flag = true;
@@ -2527,8 +2523,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-21 03:50:53.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -2670,8 +2666,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -40,6 +40,11 @@
return super.getCollisionBoundingBoxFromPool(world, i, j, k);
}
@@ -2755,8 +2751,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -35,44 +35,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@@ -2876,8 +2872,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -46,7 +46,8 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -2899,8 +2895,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k)
{
@@ -2955,8 +2951,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -2976,8 +2972,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3007,8 +3003,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -36,24 +36,24 @@
private boolean canPlaceTorchOn(World world, int i, int j, int k)
@@ -3111,10 +3107,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{
flag = true;
}
Only in ../src_work/minecraft_server/net/minecraft/src: BlockTorch.java.orig
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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -130,7 +130,7 @@
{
j1--;
@@ -3150,8 +3145,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3321,8 +3316,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -600,7 +600,9 @@
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY);
@@ -3335,8 +3330,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-19 16:38:48.000000000 -0400
--- ../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
@@ -6,6 +6,10 @@
import java.util.*;
@@ -3412,8 +3407,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3441,8 +3436,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 2011-09-20 21:01:46.000000000 -0400
--- ../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
@@ -6,6 +6,7 @@
import java.util.HashMap;
@@ -3500,8 +3495,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/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -6,6 +6,8 @@
import java.util.Random;
@@ -3525,8 +3520,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/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,7 +3,8 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3608,8 +3603,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -66,6 +66,13 @@
return 1.0F;
}
@@ -3625,8 +3620,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/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -4,6 +4,8 @@
package net.minecraft.src;
@@ -3662,8 +3657,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -35,4 +35,7 @@
public int sideHit;
public Vec3D hitVec;
@@ -3673,8 +3668,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -168,12 +168,11 @@
sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
for(int k = 0; k < numBlocksToUpdate; k++)
@@ -3691,8 +3686,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -3,7 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3711,8 +3706,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 2011-09-20 20:58:42.000000000 -0400
--- ../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
@@ -176,7 +176,7 @@
{
return false;
@@ -3738,8 +3733,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -61,6 +61,13 @@
{
}
@@ -3755,8 +3750,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-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-19 16:32:54.000000000 -0400
--- ../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
@@ -183,7 +183,11 @@
public boolean isAirBlock(int i, int j, int k)