summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-13 06:14:27 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-13 06:14:27 +0000
commit3e7946b89e1318de435ecbb02303d02715b988a1 (patch)
treef9396ad8d46831a102153493eae3c5ea14ed35ed /src/map/map.c
parent5693a17936d6de9ed99e6651f0c79415bf6c9870 (diff)
downloadhercules-3e7946b89e1318de435ecbb02303d02715b988a1.tar.gz
hercules-3e7946b89e1318de435ecbb02303d02715b988a1.tar.bz2
hercules-3e7946b89e1318de435ecbb02303d02715b988a1.tar.xz
hercules-3e7946b89e1318de435ecbb02303d02715b988a1.zip
- Removed @itemcheck as it was totally pointless.
- Corrected states killer/killable being easily dispellable. - Fixed the totally wrong text messages being used for @killer/@killable related atcommands, added appropiate entries to msg_athena - Magic and Misc attacks will now get type "flee" when they do less than 1 damage, this blocks them from causing additional status effects when they are blocked. - Cleaned up a bit the Basilica code, it should now properly end when you walk. - Added an unnecessary qty check when inserting cards :P - Fixed some logs not working when you enabled all logs. - Corrected unmute being a level 60 command by default (should be 80) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8256 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 1f4a2ec4b..62570b913 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -502,6 +502,8 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) {
status_change_end(bl, SC_CLOSECONFINE2, -1);
// if (sc->data[SC_BLADESTOP].timer != -1) //Won't stop when you are knocked away, go figure...
// status_change_end(bl, SC_BLADESTOP, -1);
+ if (sc->data[SC_BASILICA].timer != -1)
+ status_change_end(bl, SC_BASILICA, -1);
}
}
if (moveblock) map_delblock_sub(bl,0);