diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-07-11 12:28:51 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-07-11 12:28:54 +0100 |
| commit | aa619f1eebf23cffefc1d7a1b713a4340508a2d3 (patch) | |
| tree | a54009db81e4b56d0407d7d2e785176548b5a301 /modules/commands/bs_kick.cpp | |
| parent | b7458c5da1dc952a29c39fc7c72cbde44ace004f (diff) | |
| parent | e717ac0a89273b7eb50001b4374f3dda2934cd3a (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules/commands/bs_kick.cpp')
| -rw-r--r-- | modules/commands/bs_kick.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index 9a376d9d2..f3a3ef7cd 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -31,7 +31,7 @@ struct KickerDataImpl : KickerData void Check(ChannelInfo *ci) override { - if (amsgs || badwords || bolds || caps || colors || flood || italics || repeat || reverses || underlines) + if (amsgs || badwords || bolds || caps || colors || flood || italics || repeat || reverses || underlines || dontkickops || dontkickvoices) return; ci->Shrink<KickerData>("kickerdata"); @@ -67,6 +67,8 @@ struct KickerDataImpl : KickerData data.SetType("floodlines", Serialize::Data::DT_INT); data["floodlines"] << kd->floodlines; data.SetType("floodsecs", Serialize::Data::DT_INT); data["floodsecs"] << kd->floodsecs; data.SetType("repeattimes", Serialize::Data::DT_INT); data["repeattimes"] << kd->repeattimes; + data.SetType("dontkickops", Serialize::Data::DT_INT); data["dontkickops"] << kd->dontkickops; + data.SetType("dontkickvoices", Serialize::Data::DT_INT); data["dontkickvoices"] << kd->dontkickvoices; for (int16_t i = 0; i < TTB_SIZE; ++i) data["ttb"] << kd->ttb[i] << " "; } @@ -95,6 +97,8 @@ struct KickerDataImpl : KickerData data["floodlines"] >> kd->floodlines; data["floodsecs"] >> kd->floodsecs; data["repeattimes"] >> kd->repeattimes; + data["dontkickops"] >> kd->dontkickops; + data["dontkickvoices"] >> kd->dontkickvoices; Anope::string ttb, tok; data["ttb"] >> ttb; |