SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-06-18 22:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup merge

Browse Source
This commit is contained in:
Lion Kortlepel
2022-03-31 22:17:10 +02:00
parent 104737571c
commit 450f0a6875
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/TLuaEngine.h
+2 -2
View File
@@ -173,7 +173,7 @@ public:
// Debugging functions (slow) // Debugging functions (slow)
std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId); std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId);
std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueueForState(TLuaStateId StateId); std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueueForState(TLuaStateId StateId);
std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> Debug_GetStateFunctionQueueForState(TLuaStateId StateId); std::vector<QueuedFunction> Debug_GetStateFunctionQueueForState(TLuaStateId StateId);
std::vector<TLuaResult> Debug_GetResultsToCheckForState(TLuaStateId StateId); std::vector<TLuaResult> Debug_GetResultsToCheckForState(TLuaStateId StateId);
private: private:
@@ -199,7 +199,7 @@ private:
// Debug functions, slow // Debug functions, slow
std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue(); std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> Debug_GetStateFunctionQueue(); std::vector<TLuaEngine::QueuedFunction> Debug_GetStateFunctionQueue();
private: private:
sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs); sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
src/LuaAPI.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ static inline bool InternalTriggerClientEvent(int PlayerID, const std::string& E
auto c = MaybeClient.value().lock(); auto c = MaybeClient.value().lock();
if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) { if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) {
beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID)); beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets"); LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
return false; return false;
} }
} }
src/TConsole.cpp
+3 -3
View File
@@ -484,9 +484,9 @@ void TConsole::HandleLuaInternalCommand(const std::string& cmd) {
std::vector<std::string> FunctionsInOrder; std::vector<std::string> FunctionsInOrder;
while (!QueuedFunctions.empty()) { while (!QueuedFunctions.empty()) {
auto Tuple = QueuedFunctions.front(); auto Tuple = QueuedFunctions.front();
QueuedFunctions.pop(); QueuedFunctions.erase(QueuedFunctions.begin());
FunctionsInOrder.push_back(std::get<0>(Tuple)); FunctionsInOrder.push_back(Tuple.FunctionName);
FunctionsCount[std::get<0>(Tuple)] += 1; FunctionsCount[Tuple.FunctionName] += 1;
} }
std::set<std::string> Uniques; std::set<std::string> Uniques;
for (const auto& Function : FunctionsInOrder) { for (const auto& Function : FunctionsInOrder) {
src/TLuaEngine.cpp
+4 -4
View File
@@ -177,8 +177,8 @@ std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::Debug_
return Result; return Result;
} }
std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> TLuaEngine::Debug_GetStateFunctionQueueForState(TLuaStateId StateId) { std::vector<TLuaEngine::QueuedFunction> TLuaEngine::Debug_GetStateFunctionQueueForState(TLuaStateId StateId) {
std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> Result; std::vector<TLuaEngine::QueuedFunction> Result;
std::unique_lock Lock(mLuaStatesMutex); std::unique_lock Lock(mLuaStatesMutex);
Result = mLuaStates.at(StateId)->Debug_GetStateFunctionQueue(); Result = mLuaStates.at(StateId)->Debug_GetStateFunctionQueue();
return Result; return Result;
@@ -191,7 +191,7 @@ std::vector<TLuaResult> TLuaEngine::Debug_GetResultsToCheckForState(TLuaStateId
std::vector<TLuaResult> Result; std::vector<TLuaResult> Result;
while (!ResultsToCheckCopy.empty()) { while (!ResultsToCheckCopy.empty()) {
auto ResultToCheck = std::move(ResultsToCheckCopy.front()); auto ResultToCheck = std::move(ResultsToCheckCopy.front());
ResultsToCheckCopy.pop(); ResultsToCheckCopy.pop_front();
if (ResultToCheck->StateId == StateId) { if (ResultToCheck->StateId == StateId) {
Result.push_back(*ResultToCheck); Result.push_back(*ResultToCheck);
} }
@@ -917,7 +917,7 @@ std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::StateT
return mStateExecuteQueue; return mStateExecuteQueue;
} }
std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> TLuaEngine::StateThreadData::Debug_GetStateFunctionQueue() { std::vector<TLuaEngine::QueuedFunction> TLuaEngine::StateThreadData::Debug_GetStateFunctionQueue() {
std::unique_lock Lock(mStateFunctionQueueMutex); std::unique_lock Lock(mStateFunctionQueueMutex);
return mStateFunctionQueue; return mStateFunctionQueue;
} }