diff --git a/SDK-GMLIB b/SDK-GMLIB index 41b3a0c..193e7eb 160000 --- a/SDK-GMLIB +++ b/SDK-GMLIB @@ -1 +1 @@ -Subproject commit 41b3a0cf5ff473fdb6a37597c73fd47f992b6736 +Subproject commit 193e7eb7102366a387efb5325b42ba1b622570a2 diff --git a/src/Cleaner.cpp b/src/Cleaner.cpp index 00cc3d2..f001004 100644 --- a/src/Cleaner.cpp +++ b/src/Cleaner.cpp @@ -12,7 +12,7 @@ using namespace ll::schedule; using namespace ll::chrono_literals; int item_despawn_time = 3000; -ServerTimeAsyncScheduler scheduler; +//ServerTimeAsyncScheduler scheduler; bool auto_clean_triggerred = false; namespace Cleaner { @@ -134,25 +134,25 @@ void CleanTask(int time, int announce_time) { auto time_1 = std::chrono::seconds::duration(time); auto time_2 = std::chrono::seconds::duration(time - announce_time); logger.info(Language->translate("cleaner.output.count1", {S(time_1.count())})); - scheduler.add(time_2, [announce_time] { + //scheduler.add(time_2, [announce_time] { logger.info(Language->translate("cleaner.output.count2", {S(announce_time)})); - }); - scheduler.add(time_1, [] { + //}); + //scheduler.add(time_1, [] { auto count = ExecuteClean(); logger.info(Language->translate("cleaner.output.finish", {S(count)})); auto_clean_triggerred = false; - }); + //}); } void AutoCleanTask(int seconds) { auto time = std::chrono::seconds::duration(seconds); - mAutoCleanTask = scheduler.add(time, [] { + //mAutoCleanTask = scheduler.add(time, [] { CleanTask(Config->getValue({"Basic", "Notice1"}, 20), Config->getValue({"Basic", "Notice2"}, 15)); - }); + //}); } void CheckCleanTask(int max_entities, float min_tps) { - mCheckCleanTask = scheduler.add(10s, [max_entities, min_tps] { + //mCheckCleanTask = scheduler.add(10s, [max_entities, min_tps] { auto count = CountEntities(); if (auto_clean_triggerred == false) { if (count >= max_entities) { @@ -174,7 +174,7 @@ void CheckCleanTask(int max_entities, float min_tps) { ); } } - }); + //}); } void setShouldIgnore(GMLIB_Actor* ac) { diff --git a/src/RegisterCommand.cpp b/src/RegisterCommand.cpp index aa97427..c2dd782 100644 --- a/src/RegisterCommand.cpp +++ b/src/RegisterCommand.cpp @@ -59,12 +59,11 @@ void RegCleanerCommand(CommandRegistry& registry) { Language->translate("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())}) ); } else if (act == "clean") { - output.success(Language->translate("cleaner.output.opClean")); Cleaner::CleanTask( Config->getValue({"Basic", "Notice1"}, 20), Config->getValue({"Basic", "Notice2"}, 15) - ); // Config - return; + ); + return output.success(Language->translate("cleaner.output.opClean")); } else if (act == "reload") { Cleaner::reloadCleaner(); return output.success(Language->translate("cleaner.output.reload")); @@ -79,12 +78,12 @@ void RegCleanerCommand(CommandRegistry& registry) { void RegisterCommands() { auto registry = ll::service::bedrock::getCommandRegistry(); - RegCleanerCommand(registry); - RegVoteCommand(registry); + // RegCleanerCommand(registry); + // RegVoteCommand(registry); } void UnregisterCommands() { - auto registry = ll::service::bedrock::getCommandRegistry(); - registry->unregisterCommand(Config->getValue({"Basic", "Command"}, "cleaner")); - // registry->unregisterCommand("voteclean"); + // auto registry = ll::service::bedrock::getCommandRegistry(); + // registry->unregisterCommand(Config->getValue({"Basic", "Command"}, "cleaner")); + // registry->unregisterCommand("voteclean"); } \ No newline at end of file