Merge branch 'smartcmd:main' into main

1 files changed, 5 insertions, 5 deletions

diff --git a/Minecraft.World/PortalForcer.cpp b/Minecraft.World/PortalForcer.cpp
index b3850807..9695afdf 100644
--- a/Minecraft.World/PortalForcer.cpp
+++ b/Minecraft.World/PortalForcer.cpp
@@ -6,7 +6,7 @@
 #include "..\Minecraft.Client\ServerLevel.h"
 #include "PortalForcer.h"
 
-PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, __int64 time) : Pos(x, y, z)
+PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, int64_t time) : Pos(x, y, z)
 {
 	lastUsed = time;
 }
@@ -502,18 +502,18 @@ next_second: continue;
 	return true;
 }
 
-void PortalForcer::tick(__int64 time)
+void PortalForcer::tick(int64_t time)
 {
 	if (time % (SharedConstants::TICKS_PER_SECOND * 5) == 0)
 	{
-		__int64 cutoff = time - SharedConstants::TICKS_PER_SECOND * 30;
+		int64_t cutoff = time - SharedConstants::TICKS_PER_SECOND * 30;
 
         for (auto it = cachedPortalKeys.begin(); it != cachedPortalKeys.end();)
         {
-			__int64 key = *it;
+			int64_t key = *it;
 			PortalPosition *pos = cachedPortals[key];
 
-			if (pos == NULL || pos->lastUsed < cutoff)
+			if (pos == nullptr || pos->lastUsed < cutoff)
 			{
 				delete pos;
 				it = cachedPortalKeys.erase(it);