From be571b5cd04f3986dc5725b4b04b4f94bd67a16c Mon Sep 17 00:00:00 2001
From: ErodeesFleurs <3353309908@qq.com>
Date: Tue, 2 Apr 2024 09:34:06 +0800
Subject: add world.sendPacket and fixed deadlock

---
 source/game/scripting/StarWorldLuaBindings.cpp | 7 +++++++
 source/game/scripting/StarWorldLuaBindings.hpp | 1 +
 2 files changed, 8 insertions(+)

(limited to 'source/game/scripting')

diff --git a/source/game/scripting/StarWorldLuaBindings.cpp b/source/game/scripting/StarWorldLuaBindings.cpp
index cc91ec2..0016589 100644
--- a/source/game/scripting/StarWorldLuaBindings.cpp
+++ b/source/game/scripting/StarWorldLuaBindings.cpp
@@ -390,6 +390,7 @@ namespace LuaBindings {
       callbacks.registerCallbackWithSignature<List<EntityId>>("players", bind(ServerWorldCallbacks::players, world));
       callbacks.registerCallbackWithSignature<LuaString, LuaEngine&>("fidelity", bind(ServerWorldCallbacks::fidelity, world, _1));
       callbacks.registerCallbackWithSignature<Maybe<LuaValue>, String, String, LuaVariadic<LuaValue>>("callScriptContext", bind(ServerWorldCallbacks::callScriptContext, world, _1, _2, _3));
+      callbacks.registerCallbackWithSignature<void, ConnectionId, String, Json>("sendPacket", bind(ServerWorldCallbacks::sendPacket, world, _1, _2, _3));
 
       callbacks.registerCallbackWithSignature<double>("skyTime", [serverWorld]() {
           return serverWorld->sky()->epochTime();
@@ -1186,6 +1187,12 @@ namespace LuaBindings {
     return context->invoke(function, args);
   }
 
+  void 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);
+  }
+
   void WorldDebugCallbacks::debugPoint(Vec2F const& arg1, Color const& arg2) {
     SpatialLogger::logPoint("world", arg1, arg2.toRgba());
   }
diff --git a/source/game/scripting/StarWorldLuaBindings.hpp b/source/game/scripting/StarWorldLuaBindings.hpp
index 010affd..114536d 100644
--- a/source/game/scripting/StarWorldLuaBindings.hpp
+++ b/source/game/scripting/StarWorldLuaBindings.hpp
@@ -88,6 +88,7 @@ namespace LuaBindings {
     List<EntityId> players(World* world);
     LuaString fidelity(World* world, LuaEngine& engine);
     Maybe<LuaValue> callScriptContext(World* world, String const& contextName, String const& function, LuaVariadic<LuaValue> const& args);
+    void sendPacket(WorldServer* world, ConnectionId clientId, String const& packetType, Json const& packetData);
   }
 
   namespace WorldDebugCallbacks {
-- 
cgit v1.2.3