Skip to content

Commit

Permalink
Merge branch 'multistate' of https://github.com/ElunaLuaEngine/Eluna
Browse files Browse the repository at this point in the history
…into multistate
  • Loading branch information
Foereaper committed Jan 15, 2024
2 parents 0f92a1e + 8234268 commit efae16e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
with:
submodules: false
repository: ElunaLuaEngine/ElunaTrinityWotlk
ref: multistate
- uses: actions/checkout@v3
with:
path: src/server/game/LuaEngine
Expand Down
6 changes: 3 additions & 3 deletions LuaValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ LuaVal LuaVal::AsLuaVal(lua_State* L, int index)
case LUA_TUSERDATA:
if (LuaVal* ptr = GetLuaVal(L, index))
return ptr->reference();
default:
luaL_argerror(L, index, "Trying to use unsupported type");
return LuaVal();
break;
}
luaL_argerror(L, index, "Trying to use unsupported type");
return LuaVal();
}

int LuaVal::lua_AsLuaVal(lua_State* L)
Expand Down

0 comments on commit efae16e

Please sign in to comment.