From 662f12da9624435b1850b424817879f12b7a30b2 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 2 Apr 2024 13:39:34 +1100 Subject: improvements to universe.sendPacket and world.sendPacket adds necessary clientsMutex lock, and returns false if sending failed --- source/game/scripting/StarWorldLuaBindings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/game/scripting/StarWorldLuaBindings.cpp') diff --git a/source/game/scripting/StarWorldLuaBindings.cpp b/source/game/scripting/StarWorldLuaBindings.cpp index 8287903..13be5ee 100644 --- a/source/game/scripting/StarWorldLuaBindings.cpp +++ b/source/game/scripting/StarWorldLuaBindings.cpp @@ -390,7 +390,7 @@ namespace LuaBindings { callbacks.registerCallbackWithSignature>("players", bind(ServerWorldCallbacks::players, world)); callbacks.registerCallbackWithSignature("fidelity", bind(ServerWorldCallbacks::fidelity, world, _1)); callbacks.registerCallbackWithSignature, String, String, LuaVariadic>("callScriptContext", bind(ServerWorldCallbacks::callScriptContext, world, _1, _2, _3)); - callbacks.registerCallbackWithSignature("sendPacket", bind(ServerWorldCallbacks::sendPacket, serverWorld, _1, _2, _3)); + callbacks.registerCallbackWithSignature("sendPacket", bind(ServerWorldCallbacks::sendPacket, serverWorld, _1, _2, _3)); callbacks.registerCallbackWithSignature("skyTime", [serverWorld]() { return serverWorld->sky()->epochTime(); @@ -1187,10 +1187,10 @@ namespace LuaBindings { return context->invoke(function, args); } - void ServerWorldCallbacks::sendPacket(WorldServer* world, ConnectionId clientId, String const& packetType, Json const& packetData) { + bool ServerWorldCallbacks::sendPacket(WorldServer* world, ConnectionId clientId, String const& packetType, Json const& packetData) { PacketType type = PacketTypeNames.getLeft(packetType); auto packet = createPacket(type, packetData); - world->sendPacket(clientId, packet); + return world->sendPacket(clientId, packet); } void WorldDebugCallbacks::debugPoint(Vec2F const& arg1, Color const& arg2) { -- cgit v1.2.3