wed150/Cleaner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix error

Browse Source
This commit is contained in:
Tsubasa6848
2024-01-21 11:01:26 +08:00
Unverified
parent b4f9433e7c
commit 4d8499730b
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDK-GMLIB
+1 -1
Submodule SDK-GMLIB updated: 41b3a0cf5f...193e7eb710
src/Cleaner.cpp
+9 -9
View File
@@ -12,7 +12,7 @@ using namespace ll::schedule;
using namespace ll::chrono_literals; using namespace ll::chrono_literals;
int item_despawn_time = 3000; int item_despawn_time = 3000;
ServerTimeAsyncScheduler scheduler; //ServerTimeAsyncScheduler scheduler;
bool auto_clean_triggerred = false; bool auto_clean_triggerred = false;
namespace Cleaner { namespace Cleaner {
@@ -134,25 +134,25 @@ void CleanTask(int time, int announce_time) {
auto time_1 = std::chrono::seconds::duration(time); auto time_1 = std::chrono::seconds::duration(time);
auto time_2 = std::chrono::seconds::duration(time - announce_time); auto time_2 = std::chrono::seconds::duration(time - announce_time);
logger.info(Language->translate("cleaner.output.count1", {S(time_1.count())})); logger.info(Language->translate("cleaner.output.count1", {S(time_1.count())}));
scheduler.add<DelayTask>(time_2, [announce_time] { //scheduler.add<DelayTask>(time_2, [announce_time] {
logger.info(Language->translate("cleaner.output.count2", {S(announce_time)})); logger.info(Language->translate("cleaner.output.count2", {S(announce_time)}));
}); //});
scheduler.add<DelayTask>(time_1, [] { //scheduler.add<DelayTask>(time_1, [] {
auto count = ExecuteClean(); auto count = ExecuteClean();
logger.info(Language->translate("cleaner.output.finish", {S(count)})); logger.info(Language->translate("cleaner.output.finish", {S(count)}));
auto_clean_triggerred = false; auto_clean_triggerred = false;
}); //});
} }
void AutoCleanTask(int seconds) { void AutoCleanTask(int seconds) {
auto time = std::chrono::seconds::duration(seconds); auto time = std::chrono::seconds::duration(seconds);
mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { //mAutoCleanTask = scheduler.add<RepeatTask>(time, [] {
CleanTask(Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice2"}, 15)); CleanTask(Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice2"}, 15));
}); //});
} }
void CheckCleanTask(int max_entities, float min_tps) { void CheckCleanTask(int max_entities, float min_tps) {
mCheckCleanTask = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] { //mCheckCleanTask = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] {
auto count = CountEntities(); auto count = CountEntities();
if (auto_clean_triggerred == false) { if (auto_clean_triggerred == false) {
if (count >= max_entities) { if (count >= max_entities) {
@@ -174,7 +174,7 @@ void CheckCleanTask(int max_entities, float min_tps) {
); );
} }
} }
}); //});
} }
void setShouldIgnore(GMLIB_Actor* ac) { void setShouldIgnore(GMLIB_Actor* ac) {
src/RegisterCommand.cpp
+6 -7
View File
@@ -59,12 +59,11 @@ void RegCleanerCommand(CommandRegistry& registry) {
Language->translate("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())}) Language->translate("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())})
); );
} else if (act == "clean") { } else if (act == "clean") {
output.success(Language->translate("cleaner.output.opClean"));
Cleaner::CleanTask( Cleaner::CleanTask(
Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice1"}, 20),
Config->getValue<int>({"Basic", "Notice2"}, 15) Config->getValue<int>({"Basic", "Notice2"}, 15)
); // Config );
return; return output.success(Language->translate("cleaner.output.opClean"));
} else if (act == "reload") { } else if (act == "reload") {
Cleaner::reloadCleaner(); Cleaner::reloadCleaner();
return output.success(Language->translate("cleaner.output.reload")); return output.success(Language->translate("cleaner.output.reload"));
@@ -79,12 +78,12 @@ void RegCleanerCommand(CommandRegistry& registry) {
void RegisterCommands() { void RegisterCommands() {
auto registry = ll::service::bedrock::getCommandRegistry(); auto registry = ll::service::bedrock::getCommandRegistry();
RegCleanerCommand(registry); // RegCleanerCommand(registry);
RegVoteCommand(registry); // RegVoteCommand(registry);
} }
void UnregisterCommands() { void UnregisterCommands() {
auto registry = ll::service::bedrock::getCommandRegistry(); // auto registry = ll::service::bedrock::getCommandRegistry();
registry->unregisterCommand(Config->getValue<std::string>({"Basic", "Command"}, "cleaner")); // registry->unregisterCommand(Config->getValue<std::string>({"Basic", "Command"}, "cleaner"));
// registry->unregisterCommand("voteclean"); // registry->unregisterCommand("voteclean");
} }