summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-07-04 05:17:17 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-07-04 05:17:17 +0800
commitca0205134beb9ba26e989c9fc3820c086d4d22a7 (patch)
tree6790ece04272e548a46ee2255364b026def3fd6e /src/map/unit.c
parent28a9fec0916db3d92629ae6e6cd62b5777b09e73 (diff)
parentd88be27960c4508c2f61a729fb5e4c89965b7e0b (diff)
downloadhercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.gz
hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.bz2
hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.xz
hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 5e836dc2e..e5affb0c2 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -945,7 +945,7 @@ int unit_can_move(struct block_list *bl) {
|| sc->data[SC__MANHOLE]
|| sc->data[SC_CURSEDCIRCLE_ATKER]
|| sc->data[SC_CURSEDCIRCLE_TARGET]
- || (sc->data[SC_CRYSTALIZE] && bl->type != BL_MOB)
+ || (sc->data[SC_COLD] && bl->type != BL_MOB)
|| sc->data[SC_NETHERWORLD]
|| (sc->data[SC_CAMOUFLAGE] && sc->data[SC_CAMOUFLAGE]->val1 < 3 && !(sc->data[SC_CAMOUFLAGE]->val3&1))
|| sc->data[SC_MEIKYOUSISUI]