re-enable battle launching from MapState

[l2e.git] / src / map / MapState.cpp

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index ca1dafb0542691556627858c482d755de24005ee..9bae990ce6d72c053ce1b252a48a121cf49d0f67 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -299,6 +299,7 @@ bool MapState::CheckMonster() {
                for (std::vector<Entity *>::iterator e(entities.begin()), end(entities.end()); e != end; ++e) {
                        if ((*e)->Hostile() && map->TileCoordinates(ToInt((*e)->Position())) == neighbor[i]) {
                                // TODO: move entity erase to happen after the transition or battle
+                               LoadBattle(*controlled, **e);
                                entities.erase(e);
                                return true;
                        }