Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 12 insertions, 12 deletions

diff --git a/Minecraft.World/ShearsItem.cpp b/Minecraft.World/ShearsItem.cpp
index 7f4d8d51..dd0c2ac7 100644
--- a/Minecraft.World/ShearsItem.cpp
+++ b/Minecraft.World/ShearsItem.cpp
@@ -9,14 +9,14 @@ ShearsItem::ShearsItem(int itemId) : Item(itemId)
 	setMaxDamage(238);
 }
 
-bool ShearsItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner)
+bool ShearsItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<LivingEntity> owner)
 {
-    if (tile == Tile::leaves_Id || tile == Tile::web_Id || tile == Tile::tallgrass_Id || tile == Tile::vine_Id || tile == Tile::tripWire_Id)
+	if (tile == Tile::leaves_Id || tile == Tile::web_Id || tile == Tile::tallgrass_Id || tile == Tile::vine_Id || tile == Tile::tripWire_Id)
 	{
-        itemInstance->hurt(1, owner);
+		itemInstance->hurtAndBreak(1, owner);
 		return true;
-    }
-    return Item::mineBlock(itemInstance, level, tile, x, y, z, owner);
+	}
+	return Item::mineBlock(itemInstance, level, tile, x, y, z, owner);
 }
 
 bool ShearsItem::canDestroySpecial(Tile *tile)
@@ -26,13 +26,13 @@ bool ShearsItem::canDestroySpecial(Tile *tile)
 
 float ShearsItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
 {
-    if (tile->id == Tile::web_Id || tile->id == Tile::leaves_Id)
+	if (tile->id == Tile::web_Id || tile->id == Tile::leaves_Id)
 	{
-        return 15;
-    }
-    if (tile->id == Tile::cloth_Id)
+		return 15;
+	}
+	if (tile->id == Tile::wool_Id)
 	{
-        return 5;
-    }
-    return Item::getDestroySpeed(itemInstance, tile);
+		return 5;
+	}
+	return Item::getDestroySpeed(itemInstance, tile);
 }
\ No newline at end of file