Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.Client/Common/GameRules/GameRule.h b/Minecraft.Client/Common/GameRules/GameRule.h
index bdc2ceff..e35f1375 100644
--- a/Minecraft.Client/Common/GameRules/GameRule.h
+++ b/Minecraft.Client/Common/GameRules/GameRule.h
@@ -14,7 +14,7 @@ public:
 	typedef struct _ValueType
 	{
 		union{
-			__int64				i64;
+			int64_t				i64;
 			int					i;
 			char				c;
 			bool				b;
@@ -40,11 +40,11 @@ public:
 	stringValueMapType m_parameters; // These are the members of this rule that maintain it's state
 
 public:
-	GameRule(GameRuleDefinition *definition, Connection *connection = NULL);
+	GameRule(GameRuleDefinition *definition, Connection *connection = nullptr);
 	virtual ~GameRule();
 
 	Connection *getConnection() { return m_connection; }
-	
+
 	ValueType getParameter(const wstring &parameterName);
 	void setParameter(const wstring &parameterName,ValueType value);
 	GameRuleDefinition *getGameRuleDefinition();