fix: getNewScoreboard no longer crashes on Linux

EndstoneMC · Aug 3, 2024 · 39acfab · 39acfab
1 parent 85767fa
commit 39acfab
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/include/bedrock/server/commands/command_soft_enum_registry.h b/include/bedrock/server/commands/command_soft_enum_registry.h
@@ -18,5 +18,9 @@
 
 class CommandSoftEnumRegistry {
 public:
-    CommandRegistry *registry;
+    CommandSoftEnumRegistry() = default;
+    CommandSoftEnumRegistry(const CommandSoftEnumRegistry &other) = default;
+    CommandSoftEnumRegistry &operator=(const CommandSoftEnumRegistry &other) = default;
+
+    CommandRegistry *registry{nullptr};
 };
diff --git a/include/endstone/detail/hook.h b/include/endstone/detail/hook.h
@@ -142,12 +142,21 @@ inline std::function<Return *(Return *, const Class *, Arg...)> get_original_rvo
     *endstone::detail::hook::get_original_rvo(fp, name)(&ret, __VA_ARGS__)
 
 namespace endstone::detail::hook {
+#ifdef _WIN32
 template <typename Class, typename... Args>
-std::function<Class *(void *, Args...)> get_ctor(std::unique_ptr<Class> (*)(Args...), const std::string &name)
+std::function<Class *(Class *, Args...)> get_ctor(std::unique_ptr<Class> (*)(Args...), const std::string &name)
 {
     static auto *original = get_original(name);
-    return reinterpret_cast<Class *(*)(void *, Args...)>(original);
+    return reinterpret_cast<Class *(*)(Class *, Args...)>(original);
 }
+#elif __linux__
+template <typename Class, typename... Args>
+std::function<void(Class *, Args...)> get_ctor(std::unique_ptr<Class> (*)(Args...), const std::string &name)
+{
+    static auto *original = get_original(name);
+    return reinterpret_cast<void (*)(Class *, Args...)>(original);
+}
+#endif
 }  // namespace endstone::detail::hook
 
 #define ENDSTONE_FACTORY_DECLARE(type, ...) static std::unique_ptr<type> create(__VA_ARGS__);
@@ -160,13 +169,14 @@ std::function<Class *(void *, Args...)> get_ctor(std::unique_ptr<Class> (*)(Args
     "_ZN" + std::to_string(std::strlen(ENDSTONE_TOSTRING(type))) + ENDSTONE_TOSTRING(type) "C2"
 #endif
 
-#define ENDSTONE_FACTORY_IMPLEMENT(type, ...)                                                            \
-    {                                                                                                    \
-        static std::string func_decorated_name = __FUNCDNAME__;                                          \
-        static std::string name =                                                                        \
-            ENDSTONE_FACTORY_PREFIX_REPLACEMENT(type) +                                                  \
-            func_decorated_name.substr(func_decorated_name.find(ENDSTONE_FACTORY_PREFIX_TARGET(type)) +  \
-                                       std::strlen(ENDSTONE_FACTORY_PREFIX_TARGET(type)));               \
-        return std::unique_ptr<type>(                                                                    \
-            endstone::detail::hook::get_ctor(&type::create, name)(new char[sizeof(type)], __VA_ARGS__)); \
+#define ENDSTONE_FACTORY_IMPLEMENT(type, ...)                                                           \
+    {                                                                                                   \
+        static std::string func_decorated_name = __FUNCDNAME__;                                         \
+        static std::string name =                                                                       \
+            ENDSTONE_FACTORY_PREFIX_REPLACEMENT(type) +                                                 \
+            func_decorated_name.substr(func_decorated_name.find(ENDSTONE_FACTORY_PREFIX_TARGET(type)) + \
+                                       std::strlen(ENDSTONE_FACTORY_PREFIX_TARGET(type)));              \
+        auto *obj = reinterpret_cast<type *>(new char[sizeof(type)]);                                   \
+        endstone::detail::hook::get_ctor(&type::create, name)(obj, __VA_ARGS__);                        \
+        return std::unique_ptr<type>(obj);                                                              \
     }
diff --git a/src/endstone_core/server.cpp b/src/endstone_core/server.cpp
@@ -261,7 +261,7 @@ void EndstoneServer::setScoreboard(std::unique_ptr<EndstoneScoreboard> scoreboar
 
 std::shared_ptr<Scoreboard> EndstoneServer::getNewScoreboard()
 {
-    CommandSoftEnumRegistry registry{};
+    CommandSoftEnumRegistry registry;
     auto board = ServerScoreboard::create(registry, nullptr, level_->getHandle()._getGameplayUserManagerStackRef());
     board->setPacketSender(level_->getHandle().getPacketSender());
     auto result = std::make_shared<EndstoneScoreboard>(std::move(board));