Add properties to landing anim excluded zones

Check this video for footage of no animation playing on landing in a property.
https://www.youtube.com/watch?v=FYqjZBnuBIg

Dockerfile

@@ -11,12 +11,7 @@ COPY --chmod=0500 ./build.sh /app/
 
 RUN sed -i 's/MARIADB_CONNECTOR_COMPILE_JOBS__=.*/MARIADB_CONNECTOR_COMPILE_JOBS__=2/' /app/CMakeVariables.txt 
 
-RUN --mount=type=cache,target=/app/build,id=build-cache \
-    mkdir -p /app/build /tmp/persisted-build && \
-    cd /app/build && \
-    cmake .. && \
-    make -j$(nproc --ignore 1) && \
-    cp -r /app/build/* /tmp/persisted-build/
+RUN ./build.sh
 
 FROM debian:12 as runtime
 
@@ -28,23 +23,23 @@ RUN --mount=type=cache,id=build-apt-cache,target=/var/cache/apt \
     rm -rf /var/lib/apt/lists/*
 
 # Grab libraries and load them
-COPY --from=build /tmp/persisted-build/mariadbcpp/libmariadbcpp.so /usr/local/lib/
+COPY --from=build /app/build/mariadbcpp/libmariadbcpp.so /usr/local/lib/
 RUN ldconfig
 
 # Server bins
-COPY --from=build /tmp/persisted-build/*Server /app/
+COPY --from=build /app/build/*Server /app/
 
 # Necessary suplimentary files
-COPY --from=build /tmp/persisted-build/*.ini /app/configs/
-COPY --from=build /tmp/persisted-build/vanity/*.* /app/vanity/
-COPY --from=build /tmp/persisted-build/navmeshes /app/navmeshes
-COPY --from=build /tmp/persisted-build/migrations /app/migrations
-COPY --from=build /tmp/persisted-build/*.dcf /app/
+COPY --from=build /app/build/*.ini /app/configs/
+COPY --from=build /app/build/vanity/*.* /app/vanity/
+COPY --from=build /app/build/navmeshes /app/navmeshes
+COPY --from=build /app/build/migrations /app/migrations
+COPY --from=build /app/build/*.dcf /app/
 
 # backup of config and vanity files to copy to the host incase 
 # of a mount clobbering the copy from above
-COPY --from=build /tmp/persisted-build/*.ini /app/default-configs/ 
-COPY --from=build /tmp/persisted-build/vanity/*.* /app/default-vanity/
+COPY --from=build /app/build/*.ini /app/default-configs/ 
+COPY --from=build /app/build/vanity/*.* /app/default-vanity/
 
 # needed as the container runs with the root user
 # and therefore sudo doesn't exist

dGame/Character.cpp

@@ -204,7 +204,6 @@ void Character::DoQuickXMLDataParse() {
 		while (currentChild) {
 			const auto* temp = currentChild->Attribute("v");
 			const auto* id = currentChild->Attribute("id");
-			const auto* si = currentChild->Attribute("si");
 			if (temp && id) {
 				uint32_t index = 0;
 				uint64_t value = 0;
@@ -213,9 +212,6 @@ void Character::DoQuickXMLDataParse() {
 				value = std::stoull(temp);
 
 				m_PlayerFlags.insert(std::make_pair(index, value));
-			} else if (si) {
-				auto value = GeneralUtils::TryParse<uint32_t>(si);
-				if (value) m_SessionFlags.insert(value.value());
 			}
 			currentChild = currentChild->NextSiblingElement();
 		}

dGame/dComponents/CharacterComponent.cpp

@@ -95,15 +95,21 @@ bool CharacterComponent::LandingAnimDisabled(int zoneID) {
 	case 556:
 	case 1101:
 	case 1202:
+	case 1150:
+	case 1151:
 	case 1203:
 	case 1204:
+	case 1250:
+	case 1251:
 	case 1261:
 	case 1301:
 	case 1302:
 	case 1303:
+	case 1350:
 	case 1401:
 	case 1402:
 	case 1403:
+	case 1450:
 	case 1603:
 	case 2001:
 		return true;

dMasterServer/InstanceManager.cpp

@@ -273,16 +273,6 @@ Instance* InstanceManager::FindInstance(LWOMAPID mapID, LWOINSTANCEID instanceID
 	return nullptr;
 }
 
-Instance* InstanceManager::FindInstanceWithPrivate(LWOMAPID mapID, LWOINSTANCEID instanceID) {
-	for (Instance* i : m_Instances) {
-		if (i && i->GetMapID() == mapID && i->GetInstanceID() == instanceID && !i->GetShutdownComplete() && !i->GetIsShuttingDown()) {
-			return i;
-		}
-	}
-
-	return nullptr;
-}
-
 Instance* InstanceManager::CreatePrivateInstance(LWOMAPID mapID, LWOCLONEID cloneID, const std::string& password) {
 	auto* instance = FindPrivateInstance(password);
 

dMasterServer/InstanceManager.h

@@ -76,25 +76,25 @@ public:
 	void Shutdown();
 
 private:
-	std::string m_IP{};
-	uint32_t m_Port{};
-	LWOZONEID m_ZoneID{};
-	int m_MaxClientsSoftCap{};
-	int m_MaxClientsHardCap{};
-	int m_CurrentClientCount{};
-	std::vector<Player> m_Players{};
-	SystemAddress m_SysAddr{};
-	bool m_Ready{};
-	bool m_IsShuttingDown{};
-	std::vector<PendingInstanceRequest> m_PendingRequests{};
-	std::vector<PendingInstanceRequest> m_PendingAffirmations{};
+	std::string m_IP;
+	uint32_t m_Port;
+	LWOZONEID m_ZoneID;
+	int m_MaxClientsSoftCap;
+	int m_MaxClientsHardCap;
+	int m_CurrentClientCount;
+	std::vector<Player> m_Players;
+	SystemAddress m_SysAddr;
+	bool m_Ready;
+	bool m_IsShuttingDown;
+	std::vector<PendingInstanceRequest> m_PendingRequests;
+	std::vector<PendingInstanceRequest> m_PendingAffirmations;
 
-	uint32_t m_AffirmationTimeout{};
+	uint32_t m_AffirmationTimeout;
 
-	bool m_IsPrivate{};
-	std::string m_Password{};
+	bool m_IsPrivate;
+	std::string m_Password;
 
-	bool m_Shutdown{};
+	bool m_Shutdown;
 
 	//Private functions:
 };
@@ -125,7 +125,6 @@ public:
 
 	Instance* FindInstance(LWOMAPID mapID, bool isFriendTransfer, LWOCLONEID cloneId = 0);
 	Instance* FindInstance(LWOMAPID mapID, LWOINSTANCEID instanceID);
-	Instance* FindInstanceWithPrivate(LWOMAPID mapID, LWOINSTANCEID instanceID);
 
 	Instance* CreatePrivateInstance(LWOMAPID mapID, LWOCLONEID cloneID, const std::string& password);
 	Instance* FindPrivateInstance(const std::string& password);

dMasterServer/MasterServer.cpp

@@ -42,7 +42,6 @@
 #include "Server.h"
 #include "CDZoneTableTable.h"
 #include "eGameMasterLevel.h"
-#include "StringifiedEnum.h"
 
 #ifdef DARKFLAME_PLATFORM_UNIX
 
@@ -557,7 +556,7 @@ void HandlePacket(Packet* packet) {
 			Instance* in = Game::im->GetInstance(zoneID, false, zoneClone);
 
 			for (auto* instance : Game::im->GetInstances()) {
-				LOG("Instance: %i/%i/%i -> %i %s", instance->GetMapID(), instance->GetCloneID(), instance->GetInstanceID(), instance == in, instance->GetSysAddr().ToString());
+				LOG("Instance: %i/%i/%i -> %i", instance->GetMapID(), instance->GetCloneID(), instance->GetInstanceID(), instance == in);
 			}
 
 			if (in && !in->GetIsReady()) //Instance not ready, make a pending request
@@ -598,10 +597,15 @@ void HandlePacket(Packet* packet) {
 				if (!Game::im->IsPortInUse(theirPort)) {
 					Instance* in = new Instance(theirIP.string, theirPort, theirZoneID, theirInstanceID, 0, 12, 12);
 
-					in->SetSysAddr(packet->systemAddress);
+					SystemAddress copy;
+					copy.binaryAddress = packet->systemAddress.binaryAddress;
+					copy.port = packet->systemAddress.port;
+
+					in->SetSysAddr(copy);
 					Game::im->AddInstance(in);
 				} else {
-					auto* instance = Game::im->FindInstanceWithPrivate(theirZoneID, static_cast<LWOINSTANCEID>(theirInstanceID));
+					auto instance = Game::im->FindInstance(
+						theirZoneID, static_cast<uint16_t>(theirInstanceID));
 					if (instance) {
 						instance->SetSysAddr(packet->systemAddress);
 					}
@@ -609,14 +613,22 @@ void HandlePacket(Packet* packet) {
 			}
 
 			if (theirServerType == ServerType::Chat) {
-				chatServerMasterPeerSysAddr = packet->systemAddress;
+				SystemAddress copy;
+				copy.binaryAddress = packet->systemAddress.binaryAddress;
+				copy.port = packet->systemAddress.port;
+
+				chatServerMasterPeerSysAddr = copy;
 			}
 
 			if (theirServerType == ServerType::Auth) {
-				authServerMasterPeerSysAddr = packet->systemAddress;
+				SystemAddress copy;
+				copy.binaryAddress = packet->systemAddress.binaryAddress;
+				copy.port = packet->systemAddress.port;
+
+				authServerMasterPeerSysAddr = copy;
 			}
 
-			LOG("Received %s server info, instance: %i port: %i", StringifiedEnum::ToString(theirServerType).data(), theirInstanceID, theirPort);
+			LOG("Received server info, instance: %i port: %i", theirInstanceID, theirPort);
 
 			break;
 		}
@@ -680,7 +692,7 @@ void HandlePacket(Packet* packet) {
 			if (instance) {
 				instance->AddPlayer(Player());
 			} else {
-				LOG("Instance missing? What?");
+				printf("Instance missing? What?");
 			}
 			break;
 		}
@@ -721,8 +733,8 @@ void HandlePacket(Packet* packet) {
 				inStream.Read<char>(character);
 				password += character;
 			}
-			auto* newInst = Game::im->CreatePrivateInstance(mapId, cloneId, password.c_str());
-			LOG("Creating private zone %i/%i/%i with password %s", newInst->GetMapID(), newInst->GetCloneID(), newInst->GetInstanceID(), password.c_str());
+
+			Game::im->CreatePrivateInstance(mapId, cloneId, password.c_str());
 
 			break;
 		}
@@ -823,10 +835,11 @@ void HandlePacket(Packet* packet) {
 		}
 
 		case MessageType::Master::SHUTDOWN_RESPONSE: {
-			CINSTREAM_SKIP_HEADER;
+			RakNet::BitStream inStream(packet->data, packet->length, false);
+			uint64_t header = inStream.Read(header);
 
 			auto* instance = Game::im->GetInstanceBySysAddr(packet->systemAddress);
-			LOG("Got shutdown response from %s", packet->systemAddress.ToString());
+
 			if (instance == nullptr) {
 				return;
 			}