From 579f4de29533f3a32cae9b8080c5eab8aa8f3ed5 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Mon, 10 Oct 2011 19:16:11 +0000 Subject: [PATCH] reactivated special armor code --- .../net/minecraft/src/Block.java.patch | 4 +-- .../net/minecraft/src/BlockButton.java.patch | 4 +-- .../net/minecraft/src/BlockChest.java.patch | 4 +-- .../minecraft/src/BlockContainer.java.patch | 4 +-- .../net/minecraft/src/BlockCrops.java.patch | 4 +-- .../net/minecraft/src/BlockDoor.java.patch | 4 +-- .../net/minecraft/src/BlockLadder.java.patch | 4 +-- .../net/minecraft/src/BlockLever.java.patch | 4 +-- .../src/BlockPressurePlate.java.patch | 4 +-- .../net/minecraft/src/BlockRail.java.patch | 4 +-- .../src/BlockRedstoneRepeater.java.patch | 4 +-- .../src/BlockRedstoneWire.java.patch | 4 +-- .../minecraft/src/BlockTallGrass.java.patch | 4 +-- .../net/minecraft/src/BlockTorch.java.patch | 4 +-- .../minecraft/src/BlockTrapDoor.java.patch | 4 +-- .../net/minecraft/src/Chunk.java.patch | 4 +-- .../minecraft/src/EffectRenderer.java.patch | 4 +-- .../net/minecraft/src/EntityLiving.java.patch | 4 +-- .../net/minecraft/src/EntityPlayer.java.patch | 34 ++++++++++++++++--- .../minecraft/src/EntityRenderer.java.patch | 4 +-- .../net/minecraft/src/Explosion.java.patch | 4 +-- .../minecraft/src/FurnaceRecipes.java.patch | 4 +-- .../net/minecraft/src/Item.java.patch | 4 +-- .../net/minecraft/src/ItemBlock.java.patch | 4 +-- .../net/minecraft/src/ItemBucket.java.patch | 4 +-- .../net/minecraft/src/ItemDye.java.patch | 4 +-- .../src/ItemFlintAndSteel.java.patch | 4 +-- .../net/minecraft/src/ItemHoe.java.patch | 4 +-- .../net/minecraft/src/ItemRedstone.java.patch | 4 +-- .../net/minecraft/src/ItemReed.java.patch | 4 +-- .../net/minecraft/src/ItemRenderer.java.patch | 4 +-- .../net/minecraft/src/ItemSeeds.java.patch | 4 +-- .../net/minecraft/src/ItemTool.java.patch | 4 +-- .../src/MovingObjectPosition.java.patch | 4 +-- .../minecraft/src/PlayerController.java.patch | 4 +-- .../src/PlayerControllerMP.java.patch | 4 +-- .../src/PlayerControllerSP.java.patch | 4 +-- .../net/minecraft/src/RenderBlocks.java.patch | 4 +-- .../net/minecraft/src/RenderEngine.java.patch | 4 +-- .../net/minecraft/src/RenderGlobal.java.patch | 4 +-- .../net/minecraft/src/RenderItem.java.patch | 4 +-- .../net/minecraft/src/RenderPlayer.java.patch | 4 +-- .../net/minecraft/src/SlotCrafting.java.patch | 4 +-- .../net/minecraft/src/Tessellator.java.patch | 4 +-- .../net/minecraft/src/TileEntity.java.patch | 4 +-- .../src/TileEntityFurnace.java.patch | 4 +-- .../src/TileEntityRendererPiston.java.patch | 4 +-- .../net/minecraft/src/World.java.patch | 4 +-- .../minecraft/src/WorldRenderer.java.patch | 4 +-- .../net/minecraft/src/Block.java.patch | 4 +-- .../net/minecraft/src/BlockButton.java.patch | 4 +-- .../net/minecraft/src/BlockChest.java.patch | 4 +-- .../minecraft/src/BlockContainer.java.patch | 4 +-- .../net/minecraft/src/BlockCrops.java.patch | 4 +-- .../net/minecraft/src/BlockDoor.java.patch | 4 +-- .../net/minecraft/src/BlockLadder.java.patch | 4 +-- .../net/minecraft/src/BlockLever.java.patch | 4 +-- .../src/BlockPressurePlate.java.patch | 4 +-- .../net/minecraft/src/BlockRail.java.patch | 4 +-- .../src/BlockRedstoneRepeater.java.patch | 4 +-- .../src/BlockRedstoneWire.java.patch | 4 +-- .../minecraft/src/BlockTallGrass.java.patch | 4 +-- .../net/minecraft/src/BlockTorch.java.patch | 4 +-- .../minecraft/src/BlockTrapDoor.java.patch | 4 +-- .../net/minecraft/src/Chunk.java.patch | 4 +-- .../net/minecraft/src/EntityLiving.java.patch | 4 +-- .../net/minecraft/src/EntityPlayer.java.patch | 34 ++++++++++++++++--- .../net/minecraft/src/Explosion.java.patch | 4 +-- .../minecraft/src/FurnaceRecipes.java.patch | 4 +-- .../net/minecraft/src/Item.java.patch | 4 +-- .../net/minecraft/src/ItemBlock.java.patch | 4 +-- .../net/minecraft/src/ItemBucket.java.patch | 4 +-- .../net/minecraft/src/ItemDye.java.patch | 4 +-- .../src/ItemFlintAndSteel.java.patch | 4 +-- .../net/minecraft/src/ItemHoe.java.patch | 4 +-- .../src/ItemInWorldManager.java.patch | 4 +-- .../net/minecraft/src/ItemRedstone.java.patch | 4 +-- .../net/minecraft/src/ItemReed.java.patch | 4 +-- .../net/minecraft/src/ItemSeeds.java.patch | 4 +-- .../net/minecraft/src/ItemTool.java.patch | 4 +-- .../src/MovingObjectPosition.java.patch | 4 +-- .../minecraft/src/PlayerInstance.java.patch | 4 +-- .../net/minecraft/src/SlotCrafting.java.patch | 4 +-- .../net/minecraft/src/TileEntity.java.patch | 4 +-- .../src/TileEntityFurnace.java.patch | 4 +-- .../net/minecraft/src/World.java.patch | 4 +-- .../net/minecraft/src/WorldServer.java.patch | 4 +-- forge/release.bat | 2 +- 88 files changed, 231 insertions(+), 179 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index b0233712d..405f22a4b 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch index cc54d7ee6..8539149b1 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch index 8c69a81af..9ea9ec81a 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 @@ -423,23 +423,23 @@ { return true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 1871f24c9..5fd9a0785 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index 2706d14e6..17b0d339a 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch index e6ba89fe8..a46e540be 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch index 78010cb2a..18e256f76 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch index f2937b1c3..d8b0a56be 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch index 16abd9ba8..4c27c2a17 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch index 2e26b4bb3..1b7425a71 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch index 488e9ef02..275b62bc8 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch index f0c5c3468..f2a839931 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index d4750f520..92c83744a 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch index c3f031031..21067a5ce 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch index e3106e78e..a602844b2 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -147,7 +147,7 @@ { j1--; diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 20285d71d..1f18cad90 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index d02350e5e..8023965ca 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch index 6e09fb385..244b0cead 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index f10cc7362..5bf97786e 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -53,7 +53,33 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -720,7 +752,9 @@ +@@ -667,6 +699,25 @@ + + protected void damageEntity(DamageSource damagesource, int i) + { ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(damagesource, i); ++ return; ++ } ++ + if(!damagesource.unblockable() && func_35162_ad()) + { + i = 1 + i >> 1; +@@ -720,7 +771,9 @@ public void destroyCurrentEquippedItem() { @@ -63,7 +89,7 @@ } public double getYOffset() -@@ -815,6 +849,10 @@ +@@ -815,6 +868,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index 852e81407..3ff87b713 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch index bb54fe948..9ad5cc435 100644 --- a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch index b8a98fc45..c789d9be7 100644 --- a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 664d38244..c1f8a5567 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 @@ -76,6 +76,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch index f9cf25b4d..46bdb8828 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch index 251d86ec2..c567eba5a 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index 66e7f77ee..7b9aae403 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch index 41c66ac63..12bc6d21f 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch index a82f7de40..4dc2c74be 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch index d22e6a1b4..1c4116d09 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch index 15778ccf7..155c33a5a 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index 3bcb926ab..1c4e3562e 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch index 9e754e858..5b1daeead 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch index ba4765bcb..b7046218c 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch index 49a2ac24d..ca6044464 100644 --- a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch index 7509b615f..1210a4b09 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index c78999f82..a01dcac60 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,9 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index 2bbbf8121..e9ac50b3f 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index f7f78623c..f1b01e65e 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index eb2044e7c..07bb39a10 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 @@ -128,6 +128,9 @@ } try diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch index dfade4d45..edb772423 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 @@ -1635,8 +1635,8 @@ } diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index f0d2249f2..c0b659304 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch index 50669f71c..179174fe6 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index fabc12a24..cfebc3c0e 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch index 6d52526c8..123700a2e 100644 --- a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index b63e70a65..d771b66e3 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 89dfe957d..9b9b22448 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch index e3f6b6cc9..bc984e398 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index 204a25f5c..5213abff5 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch index cbf615ac7..927c0f4c6 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index eb70c99a1..3d21e84c7 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch index 4b1fb3e7f..fb25e5b27 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch index 5e0acf20a..be9f6ab3a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 @@ -328,23 +328,23 @@ { return true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch index 24433f82f..cd35cd72a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index 09c53056b..df52f41f8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch index c1ea96b1f..7913f44b2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch index 7cf02273c..9f1dab787 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch index 09b539626..4a7993dc2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch index eff38e4bb..c1cbc7e1b 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch index 7034891be..5eb9f1a1e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch index 66372a4a8..5953cd8b0 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch index ec300c094..846b9a21f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index 31118139a..8e67bc098 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch index 6a8d951fa..12316c0fa 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch index 6e2fcc1cd..531e40341 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -130,7 +130,7 @@ { j1--; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 1b328d5e1..369cf0788 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch index 607f48d7d..eb01f279f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index b8f5e13ba..92bc123b8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,10 @@ import java.util.*; @@ -53,7 +53,33 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -668,7 +700,9 @@ +@@ -615,6 +647,25 @@ + + protected void damageEntity(DamageSource damagesource, int i) + { ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(damagesource, i); ++ return; ++ } ++ + if(!damagesource.func_35083_b() && func_35180_G()) + { + i = 1 + i >> 1; +@@ -668,7 +719,9 @@ public void destroyCurrentEquippedItem() { @@ -63,7 +89,7 @@ } public double getYOffset() -@@ -757,6 +791,10 @@ +@@ -757,6 +810,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch index 7ee22e874..beeee5f0d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch index 70d851bf1..89069f4f4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 545acffb2..5982ee09c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 @@ -66,6 +66,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch index 794422dc0..71dce34de 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch index ad858eb81..bca00196f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch index 30e1b2bb6..9540178fb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch index 167cde231..a0e0cdc1d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch index 4596ad1a1..9b1da5455 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index fd72220c4..3c1bda8ce 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch index c7e7bd08e..33ded38c4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch index ad19a4c59..4e4cc75f5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch index e5170c75a..69dca2ba2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch index 4bc57d9f2..b17018c38 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch index 38011b3cf..0dcfa2389 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch index bf56c4732..c6027ee04 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index 39b6ed4f9..8f4d8c418 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch index ef84f71cb..8d4d81e1f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 5511bd75c..30c940ff4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 0b57d2df1..266ac2dbd 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch index cdcb542ed..9fb2a0a26 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 @@ -54,15 +54,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { diff --git a/forge/release.bat b/forge/release.bat index 8f7c89964..9b359e143 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.7 +sh package.sh 1.1.1 pause