From 19633a0f6285f054c0f3d26232f8efa51f98032b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Zieli=C5=84ski?=
 <tomaszzielinskijedenzwielu@gmail.com>
Date: Wed, 27 Mar 2024 06:48:22 +0100
Subject: [PATCH] Build fixes

---
 lib/rmg/Zone.h                         | 3 ++-
 lib/rmg/modificators/ObjectManager.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/rmg/Zone.h b/lib/rmg/Zone.h
index a2b6d48b4..affa75d98 100644
--- a/lib/rmg/Zone.h
+++ b/lib/rmg/Zone.h
@@ -54,7 +54,8 @@ public:
 		return resourceRef + other;
 	}
 
-	T operator+(ThreadSafeProxy<T> & other)
+	template <typename U>
+	T operator+(ThreadSafeProxy<U> & other)
 	{
 		return get() + other.get();
 	}
diff --git a/lib/rmg/modificators/ObjectManager.cpp b/lib/rmg/modificators/ObjectManager.cpp
index c4f9d2af0..e514d023a 100644
--- a/lib/rmg/modificators/ObjectManager.cpp
+++ b/lib/rmg/modificators/ObjectManager.cpp
@@ -614,7 +614,7 @@ void ObjectManager::placeObject(rmg::Object & object, bool guarded, bool updateD
 			}
 		}
 
-		for (auto id : sorted)
+		for (auto id : adjacentZones)
 		{
 			auto otherZone = map.getZones().at(id);
 			if ((otherZone->getType() == ETemplateZoneType::WATER) == (zone.getType()	== ETemplateZoneType::WATER))