Browse Source

* pc_isGM() checks in gm_cant_party config checks will now check against being lower or higher than lowest_gm_level config.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13143 54d463be-8e91-2dee-dedb-b68131a5f0ec
sketchyphoenix 17 years ago
parent
commit
c8fec27dfe
2 changed files with 3 additions and 2 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/party.c

+ 1 - 0
Changelog-Trunk.txt

@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/08/26
 	* Fixed @agjgmlvl bug preventing its use on other players. (bugreport:2124) [SketchyPhoenix]
+	* pc_isGM() checks in gm_cant_party config checks will now check against being lower or higher than lowest_gm_level config.
 2008/08/25
 	* Fixed homun sp regen bug introduced on r12953 bugreport:2071 [Brain]
 	* Fixed: several compiler warnings [akrus]

+ 2 - 2
src/map/party.c

@@ -292,8 +292,8 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
 		return 0;
 	}
 	
-	if ( (pc_isGM(sd) && !pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_min_lv)
-		|| ( !pc_isGM(sd) && pc_isGM(tsd) && !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.