From fb430fa7fe88824333ff23f0c13f1573cf057453 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 1 Jun 2016 14:35:54 +0000 Subject: [PATCH] fix desync issue with image design - closes #36 --- .../src/shared/core/ServerImageDesignerManager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp index 2fd9b849..6b43cd17 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp @@ -457,7 +457,7 @@ void ServerImageDesignerManager::updateGradualCustomizations(CreatureObject * ta std::pair::iterator, std::multimap::iterator> p = ms_gradualCustomizationMap.equal_range(target->getNetworkId()); if(p.first != ms_gradualCustomizationMap.end()) { - for(std::multimap::iterator i = p.first; i != p.second; ++i) + for(std::multimap::iterator i = p.first; i != p.second;) { if(!--(i->second.countdown)) { @@ -490,7 +490,11 @@ void ServerImageDesignerManager::updateGradualCustomizations(CreatureObject * ta DEBUG_WARNING(true, ("Could not create hair %s\n", i->second.templateName.c_str())); } } - ms_gradualCustomizationMap.erase(i); + i = ms_gradualCustomizationMap.erase(i); + } + else + { + ++i; } } }