From 7ba54ffd486b47475cf269f123189275ad28048a Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 23 Jun 2014 22:06:52 -0700 Subject: [PATCH] Fix flower pots not droping the items that are inside them. --- .../net/minecraft/block/Block.java.patch | 10 ++++++++- .../minecraft/block/BlockFlowerPot.java.patch | 16 +++++++++++++- .../management/ItemInWorldManager.java.patch | 21 ++++++++++++------- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 368ffb4dae..ceee83fdae 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -199,7 +199,7 @@ } protected ItemStack func_149644_j(int p_149644_1_) -@@ -1114,6 +1153,1091 @@ +@@ -1114,6 +1153,1099 @@ return null; } @@ -374,8 +374,16 @@ + * @param x X Position + * @param y Y position + * @param z Z position ++ * @param willHarvest True if Block.harvestBlock will be called after this, if the return in true. ++ * Can be useful to delay the destruction of tile entities till after harvestBlock + * @return True if the block is actually destroyed. + */ ++ public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) ++ { ++ return removedByPlayer(world, player, x, y, z); ++ } ++ ++ @Deprecated + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) + { + return world.func_147468_f(x, y, z); diff --git a/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch b/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch index d6f38d5eb2..637b3bfad7 100644 --- a/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch @@ -22,11 +22,12 @@ super.func_149749_a(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); } -@@ -231,4 +225,14 @@ +@@ -231,4 +225,28 @@ return new TileEntityFlowerPot(Item.func_150898_a((Block)object), b0); } + ++ /*============================FORGE START=====================================*/ + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) + { @@ -36,4 +37,17 @@ + ret.add(new ItemStack(te.func_145965_a(), 1, te.func_145966_b())); + return ret; + } ++ @Override ++ public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) ++ { ++ if (willHarvest) return true; //If it will harvest, delay deletion of the block until after getDrops ++ return super.removedByPlayer(world, player, x, y, z, willHarvest); ++ } ++ @Override ++ public void func_149636_a(World world, EntityPlayer player, int x, int y, int z, int meta) ++ { ++ super.func_149636_a(world, player, x, y, z, meta); ++ world.func_147468_f(x, y, z); ++ } ++ /*===========================FORGE END==========================================*/ } diff --git a/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.java.patch b/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.java.patch index f4f971dad2..97d9a38258 100644 --- a/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.java.patch @@ -89,16 +89,23 @@ { float f = block.func_149737_a(this.field_73090_b, this.field_73090_b.field_70170_p, p_73082_1_, p_73082_2_, p_73082_3_) * (float)(l + 1); -@@ -205,7 +240,7 @@ +@@ -202,10 +237,14 @@ + + private boolean func_73079_d(int p_73079_1_, int p_73079_2_, int p_73079_3_) + { ++ return removeBlock(p_73079_1_, p_73079_2_, p_73079_3_, false); ++ } ++ private boolean removeBlock(int p_73079_1_, int p_73079_2_, int p_73079_3_, boolean canHarvest) ++ { Block block = this.field_73092_a.func_147439_a(p_73079_1_, p_73079_2_, p_73079_3_); int l = this.field_73092_a.func_72805_g(p_73079_1_, p_73079_2_, p_73079_3_); block.func_149681_a(this.field_73092_a, p_73079_1_, p_73079_2_, p_73079_3_, l, this.field_73090_b); - boolean flag = this.field_73092_a.func_147468_f(p_73079_1_, p_73079_2_, p_73079_3_); -+ boolean flag = block.removedByPlayer(field_73092_a, field_73090_b, p_73079_1_, p_73079_2_, p_73079_3_); ++ boolean flag = block.removedByPlayer(field_73092_a, field_73090_b, p_73079_1_, p_73079_2_, p_73079_3_, canHarvest); if (flag) { -@@ -217,29 +252,32 @@ +@@ -217,29 +256,32 @@ public boolean func_73084_b(int p_73084_1_, int p_73084_2_, int p_73084_3_) { @@ -138,11 +145,11 @@ if (itemstack != null) { -@@ -251,12 +289,18 @@ +@@ -251,12 +293,18 @@ } } -+ flag = this.func_73079_d(p_73084_1_, p_73084_2_, p_73084_3_); ++ flag = this.removeBlock(p_73084_1_, p_73084_2_, p_73084_3_, flag1); if (flag && flag1) { block.func_149636_a(this.field_73092_a, this.field_73090_b, p_73084_1_, p_73084_2_, p_73084_3_, l); @@ -157,7 +164,7 @@ return flag; } } -@@ -288,6 +332,7 @@ +@@ -288,6 +336,7 @@ if (itemstack1.field_77994_a == 0) { p_73085_1_.field_71071_by.field_70462_a[p_73085_1_.field_71071_by.field_70461_c] = null; @@ -165,7 +172,7 @@ } if (!p_73085_1_.func_71039_bw()) -@@ -301,31 +346,70 @@ +@@ -301,31 +350,70 @@ public boolean func_73078_a(EntityPlayer p_73078_1_, World p_73078_2_, ItemStack p_73078_3_, int p_73078_4_, int p_73078_5_, int p_73078_6_, int p_73078_7_, float p_73078_8_, float p_73078_9_, float p_73078_10_) {