Merge branch 'master' into drunk

This commit is contained in:
2016-12-04 06:55:05 +11:00
3 changed files with 3 additions and 1 deletions
+1
View File
@@ -62,6 +62,7 @@ int BarrierData::Update(lua_State* L) {
}
ret += lua_tonumber(L, -1);
lua_pop(L, 1);
}
Entity::Update();