diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 13:19:50 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 13:19:50 +0000 |
| commit | c3bbe16c177566dec7e044c5765533986b4cfdb5 (patch) | |
| tree | 0693a3ce93fed27f99f42388c0af26ac84432a8b /src/map | |
| parent | 48f0f0ae1aa04baa1743e5ca8040e02729c67320 (diff) | |
| download | hercules-c3bbe16c177566dec7e044c5765533986b4cfdb5.tar.gz hercules-c3bbe16c177566dec7e044c5765533986b4cfdb5.tar.bz2 hercules-c3bbe16c177566dec7e044c5765533986b4cfdb5.tar.xz hercules-c3bbe16c177566dec7e044c5765533986b4cfdb5.zip | |
[Corrected]:
- pc.c again (Darn I'm making more mistakes)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6843 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index f021b9e98..0918a0406 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4439,12 +4439,14 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) if(sd->vender_id)
vending_closevending(sd);
- if(sd->status.pet_id > 0 && sd->pd && !map[sd->bl.m].flag.nopenalty)
+ if(sd->status.pet_id > 0 && sd->pd)
{
- sd->pet.intimate -= sd->pd->petDB->die;
- if(sd->pet.intimate < 0)
- sd->pet.intimate = 0;
- clif_send_petdata(sd,1,sd->pet.intimate);
+ if(!map[sd->bl.m].flag.nopenalty){
+ sd->pet.intimate -= sd->pd->petDB->die;
+ if(sd->pet.intimate < 0)
+ sd->pet.intimate = 0;
+ clif_send_petdata(sd,1,sd->pet.intimate);
+ }
if(sd->pd->target_id){ // Unlock all targets...
unit_stop_attack(&sd->pd->bl);
sd->pd->target_id = 0;
|