Fix bug in unregisterCreatureEvent

Herhangi · Apr 3, 2015 · fb0d05e · fb0d05e
1 parent 95b9cfb
commit fb0d05e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/creature.cpp b/src/creature.cpp
@@ -1495,19 +1495,24 @@ bool Creature::unregisterCreatureEvent(const std::string& name)
 	}
 
 	bool resetTypeBit = true;
-	for (auto it = eventsList.begin(); it != eventsList.end(); ++it) {
+
+	auto it = eventsList.begin();
+	while (it != eventsList.end()) {
 		CreatureEvent* curEvent = *it;
 		if (curEvent == event) {
 			it = eventsList.erase(it);
-		} else if (curEvent->getEventType() == type) {
+			continue;
+		}
+
+		if (curEvent->getEventType() == type) {
 			resetTypeBit = false;
 		}
+		++it;
 	}
 
 	if (resetTypeBit) {
 		scriptEventsBitField &= ~(static_cast<uint32_t>(1) << type);
 	}
-
 	return true;
 }