Explorar o código

Fixed Red Pouch overriding nobranch mapflag

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10464 54d463be-8e91-2dee-dedb-b68131a5f0ec
Playtester %!s(int64=18) %!d(string=hai) anos
pai
achega
1b6409f462
Modificáronse 2 ficheiros con 3 adicións e 2 borrados
  1. 1 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/pc.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/05/06
+	* Fixed Red Pouch overriding nobranch mapflag [Playtester]
 	* Attempt to fix Kyrie Eleison not castable on enemy players [Playtester]
 	- please test, I can't double client to test it in pvp
 	- don't forget to recompile before testing

+ 2 - 2
src/map/pc.c

@@ -2966,8 +2966,8 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 	//Butterfly Wing (can't use noreturn flag is on)
 	if(nameid == 602 && map[sd->bl.m].flag.noreturn)
 		return 0;
-	//Dead Branch & Bloody Branch & Porings Box (can't use at GVG and when nobranch flag is on)
-	if((nameid == 604 || nameid == 12103 || nameid == 12109) && (map[sd->bl.m].flag.nobranch || map_flag_gvg(sd->bl.m)))
+	//Dead Branch & Red Pouch & Bloody Branch & Porings Box (can't use at GVG and when nobranch flag is on)
+	if((nameid == 604 || nameid == 12024 || nameid == 12103 || nameid == 12109) && (map[sd->bl.m].flag.nobranch || map_flag_gvg(sd->bl.m)))
 		return 0;
 
 	//Anodyne/Aleovera not usable while sitting.