ソースを参照

* [Fixed]:
- nullpo in pet.c caused by equipping without checking if the pet is available.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6882 54d463be-8e91-2dee-dedb-b68131a5f0ec

Lance 19 年 前
コミット
9a5c473607
2 ファイル変更7 行追加2 行削除
  1. 3 0
      Changelog-Trunk.txt
  2. 4 2
      src/map/clif.c

+ 3 - 0
Changelog-Trunk.txt

@@ -4,6 +4,9 @@ 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.
 
 2006/05/31
+	* [Fixed]:
+	  - nullpo in pet.c caused by equipping without checking if the pet is available.
+	    [Lance]
 	* [Fixed]:
 	  - Latest client support completed! [Lance]
 	* [Fixed]:

+ 4 - 2
src/map/clif.c

@@ -9263,8 +9263,10 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
 			if(sd->inventory_data[index]->type == 10)
 				RFIFOW(fd,4)=0x8000;	// 矢を無理やり装備できるように(--;
 			pc_equipitem(sd,index,RFIFOW(fd,4));
-		} else
-			pet_equipitem(sd,index);
+		} else{
+			if(sd->pd)
+				pet_equipitem(sd,index);
+		}
 	}
 }