fix: fix tpdim

LiteLDev · Jan 3, 2025 · a6f010b · a6f010b
1 parent c897aea
commit a6f010b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/ll/core/Config.h b/src/ll/core/Config.h
@@ -15,7 +15,7 @@ namespace ll {
 
 struct LeviConfig {
 
-    int version = 30;
+    int version = 31;
 
     std::string language = "system";
     struct {
@@ -24,9 +24,7 @@ struct LeviConfig {
             CommandPermissionLevel permission = CommandPermissionLevel::GameDirectors;
         };
         struct {
-            struct {
-                bool enabled = true;
-            } tpdimOverload{};
+            CmdSetting tpdimCommand{};
             CmdSetting crashCommand{false};
             CmdSetting versionCommand{};
             CmdSetting memstatsCommand{true, CommandPermissionLevel::Host};

diff --git a/src/ll/core/command/BuiltinCommands.cpp b/src/ll/core/command/BuiltinCommands.cpp
@@ -7,28 +7,19 @@
 
 namespace ll::command {
 LL_TYPE_INSTANCE_HOOK(
-    registerBuiltinCommands,
+    RegisterBuiltinCommands,
     ll::memory::HookPriority::Highest,
     ServerInstanceEventCoordinator,
     &ServerInstanceEventCoordinator::sendServerInitializeEnd,
     void,
     ::ServerInstance& ins
 ) {
     origin(ins);
+    registerTpdimCommand();
     registerVersionCommand();
     registerMemstatsCommand();
     registerCrashCommand();
     registerModManageCommand();
 }
-LL_STATIC_HOOK(
-    registerTpdimCommands,
-    ll::memory::HookPriority::Normal,
-    &TeleportCommand::setup,
-    void,
-    CommandRegistry& registry
-) {
-    origin(registry);
-    registerTpdimCommand();
-}
-void registerCommands() { static memory::HookRegistrar<registerBuiltinCommands, registerTpdimCommands> hooks{}; }
+void registerCommands() { static memory::HookRegistrar<RegisterBuiltinCommands> hooks{}; }
 } // namespace ll::command
diff --git a/src/ll/core/command/Teleport.cpp b/src/ll/core/command/Teleport.cpp
@@ -30,11 +30,13 @@ struct TpTarget {
 };
 
 void registerTpdimCommand() {
-    auto config = ll::getLeviConfig().modules.command.tpdimOverload;
+    auto config = ll::getLeviConfig().modules.command.tpdimCommand;
     if (!config.enabled) {
         return;
     }
-    auto& cmd = CommandRegistrar::getInstance().getOrCreateCommand("tp");
+    auto& cmd = CommandRegistrar::getInstance()
+                    .getOrCreateCommand("teleportdim", "commands.tp.description", config.permission)
+                    .alias("tpdim");
 
     cmd.overload<TpSelf>()
         .required("destination")