diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-28 20:26:50 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-28 20:26:50 +0000 |
| commit | 2a97fa2a68d6b57c0674681452d41c0691c7763b (patch) | |
| tree | 7fada300b3a74d1ed33514338f6967e5351fabeb | |
| parent | 2b4787d78f47142d979cb568e179387fb4befc7b (diff) | |
| download | hercules-2a97fa2a68d6b57c0674681452d41c0691c7763b.tar.gz hercules-2a97fa2a68d6b57c0674681452d41c0691c7763b.tar.bz2 hercules-2a97fa2a68d6b57c0674681452d41c0691c7763b.tar.xz hercules-2a97fa2a68d6b57c0674681452d41c0691c7763b.zip | |
- Fixed Wedding support skills healing yourself instead of partner.
- Added a check to prevent knocking back the Emperium at all costs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5792 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7e25a962e..b6065178d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,10 @@ 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/03/28
+ * Fixed Wedding support skills healing yourself instead of partner.
+ [Skotlex]
+ * Added a check to prevent knocking back the Emperium at all costs.
+ [Skotlex]
* Fixed summon mobs being able to cast "summon" skills. [Skotlex]
* Summoned mobs will inherit the size and ai properties of the master. [Skotlex]
* Added a debug function to locate all "looping warps". [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c index fbc5c6a64..25deef213 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1587,6 +1587,8 @@ int skill_blown( struct block_list *src, struct block_list *target,int count) break;
case BL_MOB:
md=(struct mob_data *)target;
+ if (md->class_ == MOBID_EMPERIUM)
+ return 0;
break;
case BL_PET:
pd=(struct pet_data *)target;
diff --git a/src/map/unit.c b/src/map/unit.c index 605a8bc24..d40ba59da 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -696,7 +696,6 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int if (sc && sc->data[SC_BLADESTOP].timer != -1){
if ((target=(struct block_list *)sc->data[SC_BLADESTOP].val4) == NULL)
return 0;
- target_id = target->id;
}
break;
case TK_JUMPKICK:
@@ -710,13 +709,14 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int if (!sd->status.partner_id)
return 0;
target = (struct block_list*)map_charid2sd(sd->status.partner_id);
- if (!target)
- {
+ if (!target) {
clif_skill_fail(sd,skill_num,0,0);
return 0;
}
break;
}
+ if (target)
+ target_id = target->id;
}
if(!target && (target=map_id2bl(target_id)) == NULL )
return 0;
|