Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from AttorneyOnline/feature/iniswap_lock

Browse Source 
Add rudimentary iniswap prevention
This commit is contained in:
scatterflower 2021-03-10 03:51:26 -06:00 committed by GitHub
commit a78a560846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/config_sample/areas.ini
View File

@ -1,5 +1,9 @@
[Basement] [Basement]
background=gs4 background=gs4
protected_area=true
iniswap_allowed=false
[Courtroom 1] [Courtroom 1]
background=gs4 background=gs4
protected_area=false
iniswap_allowed=true

3
src/area_data.cpp
View File

@ -27,7 +27,8 @@ AreaData::AreaData(QStringList characters, QString p_name, int p_index)
QSettings areas_ini("config/areas.ini", QSettings::IniFormat); QSettings areas_ini("config/areas.ini", QSettings::IniFormat);
areas_ini.beginGroup(p_name); areas_ini.beginGroup(p_name);
background = areas_ini.value("background", "gs4").toString(); background = areas_ini.value("background", "gs4").toString();
is_protected = areas_ini.value("protected_area").toBool(); is_protected = areas_ini.value("protected_area", "false").toBool();
iniswap_allowed = areas_ini.value("iniswap_allowed", "true").toBool();
bg_locked = areas_ini.value("bg_locked", "false").toBool(); bg_locked = areas_ini.value("bg_locked", "false").toBool();
areas_ini.endGroup(); areas_ini.endGroup();
player_count = 0; player_count = 0;

8
src/packets.cpp
View File

@ -363,10 +363,10 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
if (current_char != incoming_args[2].toString()) { if (current_char != incoming_args[2].toString()) {
// Selected char is different from supplied folder name // Selected char is different from supplied folder name
// This means the user is INI-swapped // This means the user is INI-swapped
// TODO: ini swap locking if (!area->iniswap_allowed) {
// if no iniswap allowed then if (!server->characters.contains(incoming_args[2].toString()))
// if (!server->characters.contains(incoming_args[2].toString())) return invalid;
// return invalid; }
qDebug() << "INI swap detected from " << getIpid(); qDebug() << "INI swap detected from " << getIpid();
} }
args.append(incoming_args[2].toString()); args.append(incoming_args[2].toString());