From b767ce84ab2463ac9e215dc13353c3721bdaa239 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 18 Jan 2012 03:03:34 +0000 Subject: [PATCH] Fixed a bug that caused snowballs to drop incorrectly. --- .../net/minecraft/src/BlockSnow.java.patch | 19 +++++++++++++++++-- .../net/minecraft/src/BlockSnow.java.patch | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch index 6d5e2ccdd..463296bf1 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch @@ -1,6 +1,14 @@ --- ../src_base/minecraft/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -75,15 +75,7 @@ +@@ -63,7 +63,6 @@ + { + if (!canPlaceBlockAt(world, i, j, k)) + { +- dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); + world.setBlockWithNotify(i, j, k, 0); + return false; + } +@@ -75,15 +74,7 @@ public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) { @@ -17,7 +25,7 @@ entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1); } -@@ -94,7 +86,7 @@ +@@ -94,14 +85,13 @@ public int quantityDropped(Random random) { @@ -26,3 +34,10 @@ } public void updateTick(World world, int i, int j, int k, Random random) + { + if (world.getSavedLightValue(EnumSkyBlock.Block, i, j, k) > 11) + { +- dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); + world.setBlockWithNotify(i, j, k, 0); + } + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch index e5b3eae7b..2ba8a0646 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch @@ -1,6 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockSnow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -75,15 +75,7 @@ +@@ -63,7 +63,6 @@ + { + if (!canPlaceBlockAt(world, i, j, k)) + { +- dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); + world.setBlockWithNotify(i, j, k, 0); + return false; + } +@@ -75,15 +74,7 @@ public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l) { @@ -17,7 +25,7 @@ entityplayer.addStat(StatList.mineBlockStatArray[blockID], 1); } -@@ -94,7 +86,7 @@ +@@ -94,14 +85,13 @@ public int quantityDropped(Random random) { @@ -26,3 +34,10 @@ } public void updateTick(World world, int i, int j, int k, Random random) + { + if (world.getSavedLightValue(EnumSkyBlock.Block, i, j, k) > 11) + { +- dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); + world.setBlockWithNotify(i, j, k, 0); + } + }