diff options
| -rw-r--r-- | src/game-server/trigger.cpp | 1 | ||||
| -rw-r--r-- | src/scripting/luascript.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp index dd1392e1..2c007260 100644 --- a/src/game-server/trigger.cpp +++ b/src/game-server/trigger.cpp @@ -50,6 +50,7 @@ void ScriptAction::process(Actor *obj) LOG_DEBUG("Script trigger area activated: " << "(" << obj << ", " << mArg << ")"); + mScript->setMap(obj->getMap()); mScript->prepare(mCallback); mScript->push(obj); mScript->push(mArg); diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index 8ea78f7c..bdff6a12 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -139,6 +139,7 @@ int LuaScript::execute() } res = lua_tointeger(mCurrentState, -1); lua_pop(mCurrentState, 1); + setMap(0); return res; } |