From 9d626d9e5ec9dea7bf9d2f5ae88e8e10de80d83d Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 4 Mar 2012 20:43:30 -0800 Subject: [PATCH] Couple of things I missed client side --- .../net/minecraft/src/EntityPlayer.java.patch | 17 +++++++++++++++-- .../net/minecraft/src/ItemShears.java.patch | 2 +- .../net/minecraft/src/SpawnerAnimals.java.patch | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 7253a33515..3895b09efc 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -96,7 +96,20 @@ if (par1Entity.func_48080_j()) { int var2 = this.inventory.getDamageVsEntity(par1Entity); -@@ -1674,6 +1706,7 @@ +@@ -1192,6 +1224,12 @@ + */ + public EnumStatus sleepInBedAt(int par1, int par2, int par3) + { ++ EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, par1, par2, par3); ++ if (customSleep != null) ++ { ++ return customSleep; ++ } ++ + if (!this.worldObj.isRemote) + { + if (this.isPlayerSleeping() || !this.isEntityAlive()) +@@ -1674,6 +1712,7 @@ return 101; } } @@ -104,7 +117,7 @@ } return var3; -@@ -1841,4 +1874,30 @@ +@@ -1841,4 +1880,30 @@ { return !this.capabilities.isFlying; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemShears.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemShears.java.patch index b29449c15d..343de9a58e 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemShears.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemShears.java.patch @@ -14,7 +14,7 @@ public boolean onBlockDestroyed(ItemStack par1ItemStack, int par2, int par3, int par4, int par5, EntityLiving par6EntityLiving) { - if (par2 != Block.leaves.blockID && par2 != Block.web.blockID && par2 != Block.tallGrass.blockID && par2 != Block.vine.blockID) -+ if (par2 != Block.leaves.blockID && par2 != Block.web.blockID && par2 != Block.tallGrass.blockID && par2 != Block.vine.blockID && Block.blocksList[par2] instanceof IShearable) ++ if (par2 != Block.leaves.blockID && par2 != Block.web.blockID && par2 != Block.tallGrass.blockID && par2 != Block.vine.blockID && !(Block.blocksList[par2] instanceof IShearable)) { return super.onBlockDestroyed(par1ItemStack, par2, par3, par4, par5, par6EntityLiving); } diff --git a/forge/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch b/forge/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch index 0411fde288..8633baa674 100644 --- a/forge/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch @@ -6,7 +6,7 @@ int var5 = par1World.getBlockId(par2, par3 - 1, par4); - return Block.func_48206_g(var5) && var5 != Block.bedrock.blockID && !par1World.isBlockNormalCube(par2, par3, par4) && !par1World.getBlockMaterial(par2, par3, par4).isLiquid() && !par1World.isBlockNormalCube(par2, par3 + 1, par4); + //Fix for 1.2.3 change.. Why guys.. why? -+ return par1World.isBlockNormalCube(par2, par3, par4) && var5 != Block.bedrock.blockID && !par1World.isBlockNormalCube(par2, par3, par4) && !par1World.getBlockMaterial(par2, par3, par4).isLiquid() && !par1World.isBlockNormalCube(par2, par3 + 1, par4); ++ return par1World.isBlockSolidOnSide(par2, par3 - 1, par4, 1) && var5 != Block.bedrock.blockID && !par1World.isBlockNormalCube(par2, par3, par4) && !par1World.getBlockMaterial(par2, par3, par4).isLiquid() && !par1World.isBlockNormalCube(par2, par3 + 1, par4); } }