fix: spawn monster (opentibiabr#2750)

lamonato29 · Jul 11, 2024 · 762eaea · 762eaea
1 parent 418aeb0
commit 762eaea
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/creatures/monsters/spawns/spawn_monster.hpp b/src/creatures/monsters/spawns/spawn_monster.hpp
@@ -32,15 +32,29 @@ class SpawnMonster {
 		centerPos(initPos), radius(initRadius) { }
 	~SpawnMonster();
 
-	SpawnMonster(SpawnMonster &&) { }
-	SpawnMonster &operator=(SpawnMonster &&) {
-		return *this;
-	}
-
 	// non-copyable
 	SpawnMonster(const SpawnMonster &) = delete;
 	SpawnMonster &operator=(const SpawnMonster &) = delete;
 
+	// moveable
+	SpawnMonster(SpawnMonster &&rhs) noexcept :
+		spawnMonsterMap(std::move(rhs.spawnMonsterMap)),
+		spawnedMonsterMap(std::move(rhs.spawnedMonsterMap)),
+		checkSpawnMonsterEvent(rhs.checkSpawnMonsterEvent), centerPos(rhs.centerPos), radius(rhs.radius), interval(rhs.interval) { }
+
+	SpawnMonster &operator=(SpawnMonster &&rhs) noexcept {
+		if (this != &rhs) {
+			spawnMonsterMap = std::move(rhs.spawnMonsterMap);
+			spawnedMonsterMap = std::move(rhs.spawnedMonsterMap);
+
+			checkSpawnMonsterEvent = rhs.checkSpawnMonsterEvent;
+			centerPos = rhs.centerPos;
+			radius = rhs.radius;
+			interval = rhs.interval;
+		}
+		return *this;
+	}
+
 	bool addMonster(const std::string &name, const Position &pos, Direction dir, uint32_t interval, uint32_t weight = 1);
 	void removeMonster(std::shared_ptr<Monster> monster);
 	void removeMonsters();

diff --git a/src/lua/functions/creatures/monster/monster_functions.cpp b/src/lua/functions/creatures/monster/monster_functions.cpp
@@ -363,8 +363,7 @@ int MonsterFunctions::luaMonsterSetSpawnPosition(lua_State* L) {
 	const Position &pos = monster->getPosition();
 	monster->setMasterPos(pos);
 
-	g_game().map.spawnsMonster.getspawnMonsterList().emplace_back(pos, 5);
-	SpawnMonster &spawnMonster = g_game().map.spawnsMonster.getspawnMonsterList().front();
+	SpawnMonster &spawnMonster = g_game().map.spawnsMonster.getspawnMonsterList().emplace_back(pos, 5);
 	uint32_t interval = getNumber<uint32_t>(L, 2, 90) * 1000 * 100 / std::max((uint32_t)1, (g_configManager().getNumber(RATE_SPAWN, __FUNCTION__) * eventschedule));
 	spawnMonster.addMonster(monster->mType->typeName, pos, DIRECTION_NORTH, static_cast<uint32_t>(interval));
 	spawnMonster.startSpawnMonsterCheck();