Make flowers and DoublePlants break like vanilla (#2247)

Author: kaniteru

src/main/java/cn/nukkit/block/BlockDoublePlant.java

@@ -4,8 +4,10 @@
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemBlock;
 import cn.nukkit.item.ItemDye;
+import cn.nukkit.item.ItemTool;
 import cn.nukkit.level.Level;
 import cn.nukkit.level.particle.BoneMealParticle;
+import cn.nukkit.level.particle.DestroyBlockParticle;
 import cn.nukkit.math.BlockFace;
 import cn.nukkit.utils.BlockColor;
 
@@ -100,9 +102,13 @@ public boolean onBreak(Item item) {
         if ((this.getDamage() & TOP_HALF_BITMASK) == TOP_HALF_BITMASK) { // Top half
             Block down = down();
             if (down instanceof BlockDoublePlant) {
-                this.getLevel().useBreakOn(down);
+                this.getLevel().useBreakOn(down, item, null, true);
             }
         } else {
+            Block up = up();
+            if (up instanceof BlockDoublePlant) {
+                this.getLevel().addParticle(new DestroyBlockParticle(this.add(0.5, 1), this));
+            }
             this.getLevel().setBlock(this, Block.get(BlockID.AIR), true, true);
         }
 
@@ -176,4 +182,14 @@ public boolean onActivate(Item item, Player player) {
     public Item toItem() {
         return new ItemBlock(this, this.getDamage() & 0x07, 1);
     }
+
+    @Override
+    public int getToolType() {
+        return ItemTool.TYPE_SHEARS;
+    }
+
+    @Override
+    public boolean breakWhenPushed() {
+        return true;
+    }
 }

src/main/java/cn/nukkit/block/BlockFlower.java

@@ -3,6 +3,7 @@
 import cn.nukkit.Player;
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemDye;
+import cn.nukkit.item.ItemTool;
 import cn.nukkit.level.Level;
 import cn.nukkit.level.particle.BoneMealParticle;
 import cn.nukkit.math.BlockFace;
@@ -135,6 +136,11 @@ protected Block getUncommonFlower() {
         return get(DANDELION);
     }
 
+    @Override
+    public int getToolType() {
+        return ItemTool.TYPE_SHEARS;
+    }
+
     @Override
     public boolean breakWhenPushed() {
         return true;

src/main/java/cn/nukkit/item/ItemTool.java

@@ -76,17 +76,26 @@ public boolean useOn(Block block) {
                 block.getToolType() == ItemTool.TYPE_HOE && this.isHoe() ||
                 block.getToolType() == ItemTool.TYPE_SWORD && this.isSword() ||
                 block.getToolType() == ItemTool.TYPE_SHEARS && this.isShears()
-                ) {
+        ) {
             this.meta++;
-        } else if (this.isSword() && block.getHardness() > 0) {
+            return true;
+        }
+
+        if (this.isSword() && block.getHardness() > 0) {
             this.meta += 2;
-        } else if (this.isHoe()) {
-            if (block.getId() == GRASS || block.getId() == DIRT) {
-                this.meta++;
-            }
-        } else {
+            return true;
+        }
+
+        if (this.isHoe() && ((block.getId() == GRASS || block.getId() == DIRT))) {
             this.meta++;
+            return true;
+        }
+
+        if (block.getId() == TALL_GRASS || block.getId() == FLOWER || block.getId() == DOUBLE_PLANT) {
+            return true;
         }
+
+        this.meta++;
         return true;
     }