diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 508c3686b..625e74cf1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,9 @@ 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]:
- Missing #include for cbasetypes.h in login server SQL.
diff --git a/src/map/clif.c b/src/map/clif.c index e704d756e..57fd3d5b3 100644 --- a/src/map/clif.c +++ b/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);
+ }
}
}
|