diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-28 03:01:46 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-28 03:01:46 +0000 |
| commit | 40a8f0771cd06fd90a4182fd7bf9be88de329bd4 (patch) | |
| tree | cbccb1e84f33c72f7f07da7e547b2cc7adc18876 /src/map | |
| parent | 91b4b5096a21a453a3eb002131877ed328554487 (diff) | |
| download | hercules-40a8f0771cd06fd90a4182fd7bf9be88de329bd4.tar.gz hercules-40a8f0771cd06fd90a4182fd7bf9be88de329bd4.tar.bz2 hercules-40a8f0771cd06fd90a4182fd7bf9be88de329bd4.tar.xz hercules-40a8f0771cd06fd90a4182fd7bf9be88de329bd4.zip | |
Fixed a couple mismatching block locks
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16349 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 69d54ad38..d7c5147e8 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4567,6 +4567,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t status_damage(target,e_bl,damage,0,0,0); // Just show damage in target. clif_damage(src, target, tick, wd.amotion, wd.dmotion, damage, wd.div_, wd.type, wd.damage2 ); + map_freeblock_unlock(); return ATK_NONE; } } diff --git a/src/map/skill.c b/src/map/skill.c index 3bb3d011b..f70290ef3 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8348,6 +8348,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if(!mapindex) { //Given map not found? clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0); + map_freeblock_unlock(); return 0; } pc_setpos(sd, mapindex, x, y, CLR_TELEPORT); |