4 Commits

5 changed files with 33 additions and 29 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "${pluginName}", "name": "${pluginName}",
"entry": "${pluginFile}", "entry": "${pluginFile}",
"type": "native", "type": "native",
"version": "0.10.0", "version": "0.10.2",
"author": "GroupMountain", "author": "GroupMountain",
"description": "Clean Entities", "description": "Clean Entities",
"dependencies": [ "dependencies": [
+1 -1
View File
@@ -57,7 +57,7 @@ bool ShouldClean(Actor* actor) {
// Mobs // Mobs
else if (en->isMob()) { else if (en->isMob()) {
if (Config->getValue<bool>({"CleanMobs", "Enabled"}, false)) { if (Config->getValue<bool>({"CleanMobs", "Enabled"}, false)) {
auto blacklist = Config->getValue<std::vector<std::string>>({"CleanMobs", "Blacklist"}, {}); auto blacklist = Config->getValue<std::vector<std::string>>({"CleanMobs", "BlackList"}, {});
for (auto& key : blacklist) { for (auto& key : blacklist) {
if (isMatch(type, key)) { if (isMatch(type, key)) {
return true; return true;
+12 -8
View File
@@ -30,14 +30,15 @@ void sendVoteForm(Player* pl) {
tr("cleaner.vote.no") tr("cleaner.vote.no")
); );
ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool { ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
fm.sendTo(pl, [](Player& player, ll::form::ModalForm::SelectedButton button) { fm.sendTo(pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
switch (button) { if (result.has_value()) {
case ll::form::ModalForm::SelectedButton::Upper: { switch (result.value()) {
case ll::form::ModalFormSelectedButton::Upper: {
voteList[player.getUuid()] = true; voteList[player.getUuid()] = true;
player.sendMessage(tr("cleaner.vote.accept")); player.sendMessage(tr("cleaner.vote.accept"));
return; return;
} }
case ll::form::ModalForm::SelectedButton::Lower: { case ll::form::ModalFormSelectedButton::Lower: {
voteList[player.getUuid()] = false; voteList[player.getUuid()] = false;
player.sendMessage(tr("cleaner.vote.deny")); player.sendMessage(tr("cleaner.vote.deny"));
return; return;
@@ -45,6 +46,7 @@ void sendVoteForm(Player* pl) {
default: default:
return; return;
} }
}
}); });
return true; return true;
}); });
@@ -104,17 +106,19 @@ void confirmForm(Player* pl) {
tr("cleaner.vote.confirmOk"), tr("cleaner.vote.confirmOk"),
tr("cleaner.vote.confirmNo") tr("cleaner.vote.confirmNo")
); );
fm.sendTo(*pl, [](Player& player, ll::form::ModalForm::SelectedButton button) { fm.sendTo(*pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
switch (button) { if (result.has_value()) {
case ll::form::ModalForm::SelectedButton::Upper: { switch (result.value()) {
case ll::form::ModalFormSelectedButton::Upper: {
return voteClean(&player); return voteClean(&player);
} }
case ll::form::ModalForm::SelectedButton::Lower: { case ll::form::ModalFormSelectedButton::Lower: {
return player.sendMessage(tr("cleaner.vote.cancel")); return player.sendMessage(tr("cleaner.vote.cancel"));
} }
default: default:
return; return;
} }
}
}); });
} }
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"format_version": 2, "format_version": 2,
"tooth": "github.com/GroupMountain/Cleaner", "tooth": "github.com/GroupMountain/Cleaner",
"version": "0.10.0", "version": "0.10.2",
"info": { "info": {
"name": "Cleaner", "name": "Cleaner",
"description": "A Powerful Entities Cleaning up Plugin for BDS", "description": "A Powerful Entities Cleaning up Plugin for BDS",
@@ -13,7 +13,7 @@
"gmlib" "gmlib"
] ]
}, },
"asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.10.0/Cleaner-windows-x64.zip", "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.10.2/Cleaner-windows-x64.zip",
"dependencies": { "dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.10.0" "github.com/GroupMountain/GMLIB": ">=0.10.0"
}, },