From ac7733eeee579e02998b65ad8631564697b5c2a0 Mon Sep 17 00:00:00 2001 From: Qiuzhizhe <42761326+quizhizhe@users.noreply.github.com> Date: Sun, 26 Mar 2023 06:50:43 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20=E6=8C=87=E4=BB=A4=E5=9C=A8=E6=97=A0?= =?UTF-8?q?=E4=BD=9C=E5=BC=8A=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LiteLoader/include/llapi/DynamicCommandAPI.h | 8 ++++---- LiteLoader/src/liteloader/AddonsHelper.cpp | 2 +- LiteLoader/src/liteloader/BuiltinCommands.cpp | 6 +++--- LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp | 4 ++-- ScriptEngine/src/api/CommandCompatibleAPI.cpp | 2 +- ScriptEngine/src/api/PlayerAPI.cpp | 1 - 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/LiteLoader/include/llapi/DynamicCommandAPI.h b/LiteLoader/include/llapi/DynamicCommandAPI.h index a9a9a15..429cc18 100644 --- a/LiteLoader/include/llapi/DynamicCommandAPI.h +++ b/LiteLoader/include/llapi/DynamicCommandAPI.h @@ -390,7 +390,7 @@ /*0*/ virtual ~DynamicCommand(); /*1*/ virtual void execute(class CommandOrigin const& origin, class CommandOutput& output) const; - LIAPI static std::unique_ptr createCommand(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag1 = {(CommandFlagValue)0x80}, CommandFlag flag2 = {(CommandFlagValue)0}, HMODULE handle = GetCurrentModule()); + LIAPI static std::unique_ptr createCommand(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag1 = {(CommandFlagValue)4}, CommandFlag flag2 = {(CommandFlagValue)0}, HMODULE handle = GetCurrentModule()); LIAPI static std::unique_ptr createCommand( std::string const& name, std::string const& description, @@ -399,7 +399,7 @@ std::vector>&& overloads, CallBackFn callback, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, - CommandFlag flag1 = {(CommandFlagValue)0x80}, + CommandFlag flag1 = {(CommandFlagValue)0x40}, CommandFlag flag2 = {(CommandFlagValue)0}, HMODULE handle = GetCurrentModule()); @@ -412,7 +412,7 @@ std::vector>&& overloads, CallBackFn callback, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, - CommandFlag flag1 = {(CommandFlagValue)0x80}, + CommandFlag flag1 = {(CommandFlagValue)0x40}, CommandFlag flag2 = {(CommandFlagValue)0}, HMODULE handle = GetCurrentModule()) { return setup(createCommand(name, description, std::move(enums), std::move(params), std::move(overloads), std::move(callback), permission, flag1, flag2, handle)); @@ -483,7 +483,7 @@ friend class DynamicCommand; - LIAPI DynamicCommandInstance(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag = {(CommandFlagValue)0x80}, HMODULE handle = GetCurrentModule()); + LIAPI DynamicCommandInstance(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag = {(CommandFlagValue)0x40}, HMODULE handle = GetCurrentModule()); LIAPI bool setBuilder(DynamicCommand::BuilderFn builder); LIAPI DynamicCommand::BuilderFn initCommandBuilder(); diff --git a/LiteLoader/src/liteloader/AddonsHelper.cpp b/LiteLoader/src/liteloader/AddonsHelper.cpp index 869bf3d..baf763d 100644 --- a/LiteLoader/src/liteloader/AddonsHelper.cpp +++ b/LiteLoader/src/liteloader/AddonsHelper.cpp @@ -514,7 +514,7 @@ public: static void setup(CommandRegistry* registry) { registry->registerCommand("addons", "LiteLoaderBDS Addons Helper (Restart required after addon changes)", - CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x80}); + CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x40}); vector addonsList; for (auto& addon : addons) diff --git a/LiteLoader/src/liteloader/BuiltinCommands.cpp b/LiteLoader/src/liteloader/BuiltinCommands.cpp index 93032bc..8043664 100644 --- a/LiteLoader/src/liteloader/BuiltinCommands.cpp +++ b/LiteLoader/src/liteloader/BuiltinCommands.cpp @@ -118,7 +118,7 @@ public: static void setup(CommandRegistry* registry) { registry->registerCommand( "tpdim", "Teleport to Dimension", CommandPermissionLevel::GameMasters, - {(CommandFlagValue)0}, {(CommandFlagValue)0x80}); + {(CommandFlagValue)0}, {(CommandFlagValue)0x40}); registry->addEnum("DimensionType", { {"overworld", DimensionType::OverWorld}, @@ -312,7 +312,7 @@ public: static void setup(CommandRegistry* registry) { // Register Cmd registry->registerCommand("ll", "LiteLoaderBDS plugin operations", - CommandPermissionLevel::Console, {(CommandFlagValue)0}, {(CommandFlagValue)0x80}); + CommandPermissionLevel::Console, {(CommandFlagValue)0}, {(CommandFlagValue)0x40}); // Register softenum vector pluginList; @@ -372,7 +372,7 @@ public: static void setup(CommandRegistry* registry) { registry->registerCommand("version", "Get the version of this server", - CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x80}); + CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x40}); registry->registerOverload("version"); } }; diff --git a/LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp b/LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp index 736a504..fb7456c 100644 --- a/LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp +++ b/LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp @@ -10,7 +10,7 @@ bool isUnlockCmdEnabled = true; void LogCommandRegistration(std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2); TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBDW4CommandPermissionLevel@@UCommandFlag@@3@Z", - CommandRegistry, std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2) { + CommandRegistry, std::string const& name, char const* description, enum CommandPermissionLevel perm, unsigned char flag1, unsigned char flag2) { // For #643 if (name.find(' ') == std::string::npos) { // If no space inside // Check whether command is already exists before registering @@ -20,7 +20,7 @@ TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@D } } if (ll::globalConfig.enableUnlockCmd) { - flag1 |= 0x80; + flag2 |= 0x40; } if (ll::globalConfig.debugMode) { LogCommandRegistration(name, description, perm, flag1, flag2); diff --git a/ScriptEngine/src/api/CommandCompatibleAPI.cpp b/ScriptEngine/src/api/CommandCompatibleAPI.cpp index 1801bfe..b9ddd5f 100644 --- a/ScriptEngine/src/api/CommandCompatibleAPI.cpp +++ b/ScriptEngine/src/api/CommandCompatibleAPI.cpp @@ -19,7 +19,7 @@ using namespace std; bool RegisterCmd(const string& cmd, const string& describe, int cmdLevel) { ::Global->registerCommand(cmd, describe.c_str(), (CommandPermissionLevel)cmdLevel, {(CommandFlagValue)0}, - {(CommandFlagValue)0x80}); + {(CommandFlagValue)0x40}); return true; } diff --git a/ScriptEngine/src/api/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp index 5130ee8..fd343ca 100644 --- a/ScriptEngine/src/api/PlayerAPI.cpp +++ b/ScriptEngine/src/api/PlayerAPI.cpp @@ -87,7 +87,6 @@ ClassDefine PlayerClassBuilder = .instanceProperty("isAdventure", &PlayerClass::isAdventure) .instanceProperty("isGliding", &PlayerClass::isGliding) .instanceProperty("isSurvival", &PlayerClass::isSurvival) -// .instanceProperty("isSpectator", &PlayerClass::isSpectator) .instanceProperty("isRiding", &PlayerClass::isRiding) .instanceProperty("isDancing", &PlayerClass::isDancing) .instanceProperty("isCreative", &PlayerClass::isCreative)