Merge branch 'smartcmd:main' into main

1 files changed, 5 insertions, 5 deletions

diff --git a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
index b928b26c..cd23cd50 100644
--- a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
@@ -36,7 +36,7 @@ void CompleteAllRuleDefinition::updateStatus(GameRule *rule)
 			progress += it.second.gr->getGameRuleDefinition()->getProgress(it.second.gr);
 		}
 	}
-	if(rule->getConnection() != NULL)
+	if(rule->getConnection() != nullptr)
 	{
 		PacketData data;
 		data.goal = goal;
@@ -45,20 +45,20 @@ void CompleteAllRuleDefinition::updateStatus(GameRule *rule)
 		int icon = -1;
 		int auxValue = 0;
 
-		if(m_lastRuleStatusChanged != NULL)
+		if(m_lastRuleStatusChanged != nullptr)
 		{
 			icon = m_lastRuleStatusChanged->getIcon();
 			auxValue = m_lastRuleStatusChanged->getAuxValue();
-			m_lastRuleStatusChanged = NULL;
+			m_lastRuleStatusChanged = nullptr;
 		}
-		rule->getConnection()->send( shared_ptr<UpdateGameRuleProgressPacket>( new UpdateGameRuleProgressPacket(getActionType(), this->m_descriptionId,icon, auxValue, 0,&data,sizeof(PacketData))));
+		rule->getConnection()->send(std::make_shared<UpdateGameRuleProgressPacket>(getActionType(), this->m_descriptionId, icon, auxValue, 0, &data, sizeof(PacketData)));
 	}
 	app.DebugPrintf("Updated CompleteAllRule - Completed %d of %d\n", progress, goal);
 }
 
 wstring CompleteAllRuleDefinition::generateDescriptionString(const wstring &description, void *data, int dataLength)
 {
-	PacketData *values = (PacketData *)data;
+	PacketData *values = static_cast<PacketData *>(data);
 	wstring newDesc = description;
 	newDesc = replaceAll(newDesc,L"{*progress*}",std::to_wstring(values->progress));
 	newDesc = replaceAll(newDesc,L"{*goal*}",std::to_wstring(values->goal));