summaryrefslogtreecommitdiff
path: root/src/map/pet.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-24 17:06:58 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-24 17:06:58 +0000
commit40fc1ff930002e0ca7301e0f2d575a40f784fb10 (patch)
tree4c4eb599f9e55d57548db8d496bf27e5ea538f6b /src/map/pet.c
parenta4b7e6cc4657bb705f187f536d68ef876cc5a441 (diff)
downloadhercules-40fc1ff930002e0ca7301e0f2d575a40f784fb10.tar.gz
hercules-40fc1ff930002e0ca7301e0f2d575a40f784fb10.tar.bz2
hercules-40fc1ff930002e0ca7301e0f2d575a40f784fb10.tar.xz
hercules-40fc1ff930002e0ca7301e0f2d575a40f784fb10.zip
- Changed Greed Scroll's type to 11 (all itemskill items should use this)
- Ignore %MDef bonuses now only reduce target's base MDEF, not MDEF2. - Updated the 'skills that cause no damage are blocked now if the skill element is blocked by the target' to only apply if the skill has a status change associated (fixes Resurrection/Heal being blocked). - Reverted the opt_flag2 change in status_change_start (clif_changeoption2) since it never served its purpose. - Added a warning to prevent loading mobs with IDs that belong to the clone range. - Changed MAX_MOB_DB to 3000, updated the definitions of the clone range defines so they are updated automatically with the change of MAX_MOB_DB. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11287 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
-rw-r--r--src/map/pet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pet.c b/src/map/pet.c
index f66492799..ac369bff5 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -215,7 +215,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
if( pd == NULL
|| (battle_config.pet_equip_required && pd->pet.equip == 0)
- || pd->recovery == NULL
+ || pd->recovery == NULL
|| pd->recovery->timer != -1
|| pd->recovery->type != type )
return 1;