Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/TallGrass.cpp b/Minecraft.World/TallGrass.cpp
index 1a89d3ed..337e343d 100644
--- a/Minecraft.World/TallGrass.cpp
+++ b/Minecraft.World/TallGrass.cpp
@@ -81,7 +81,7 @@ int TallGrass::getResourceCountForLootBonus(int bonusLevel, Random *random)
 
 void TallGrass::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
 {
-    if (!level->isClientSide && player->getSelectedItem() != NULL && player->getSelectedItem()->id == Item::shears->id)
+    if (!level->isClientSide && player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::shears->id)
 	{
         player->awardStat(
 			GenericStats::blocksMined(id), 
@@ -89,7 +89,7 @@ void TallGrass::playerDestroy(Level *level, shared_ptr<Player> player, int x, in
 			);
 
         // drop leaf block instead of sapling
-        popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(Tile::tallgrass, 1, data)));
+        popResource(level, x, y, z, std::make_shared<ItemInstance>(Tile::tallgrass, 1, data));
     }
 	else
 	{