summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-14 21:13:19 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-14 21:13:19 +0000
commit522e0a2b40e5c97f7c1b73b91c6f1406dc206969 (patch)
tree6151d5754d9f1e354d991a6d87c3c1eed5800a6c
parent66a2591b0efac372690b707ed1020a376f260ded (diff)
downloadhercules-522e0a2b40e5c97f7c1b73b91c6f1406dc206969.tar.gz
hercules-522e0a2b40e5c97f7c1b73b91c6f1406dc206969.tar.bz2
hercules-522e0a2b40e5c97f7c1b73b91c6f1406dc206969.tar.xz
hercules-522e0a2b40e5c97f7c1b73b91c6f1406dc206969.zip
* Fixed GMs with GM level equal to 'lowest_gm_level' being treated as normal players in 'gm_can_party' check (bugreport:4162, since r13143).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14705 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/party.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f72076457..b39fec45c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/02/14
+ * Fixed GMs with GM level equal to 'lowest_gm_level' being treated as normal players in 'gm_can_party' check (bugreport:4162, since r13143). [Ai4rei]
* Fixed a crash when script 'npctalk' is given too long string (bugreport:4759, related r2145). [Ai4rei]
- Fixed related buffer overflows in message related clif functions (since r1182, r14270).
2011/02/09
diff --git a/src/map/party.c b/src/map/party.c
index 9c55a05f2..21867c95a 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -309,8 +309,8 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
return 0;
}
- if ( (pc_isGM(sd) > battle_config.lowest_gm_level && pc_isGM(tsd) < battle_config.lowest_gm_level && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_min_lv)
- || ( pc_isGM(sd) < battle_config.lowest_gm_level && pc_isGM(tsd) > battle_config.lowest_gm_level && !battle_config.gm_can_party && pc_isGM(tsd) < battle_config.gm_cant_party_min_lv) )
+ if ( (pc_isGM(sd) >= battle_config.lowest_gm_level && pc_isGM(tsd) < battle_config.lowest_gm_level && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_min_lv)
+ || ( pc_isGM(sd) < battle_config.lowest_gm_level && pc_isGM(tsd) >= battle_config.lowest_gm_level && !battle_config.gm_can_party && pc_isGM(tsd) < battle_config.gm_cant_party_min_lv) )
{
//GMs can't invite non GMs to the party if not above the invite trust level
//Likewise, as long as gm_can_party is off, players can't invite GMs.