summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-29 13:52:25 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-29 13:52:25 +0200
commitfd7d1a9320453047e8657981ffbc92d7663b83dd (patch)
tree7a7741ab66f0a60b70f2d9e7f334ae934728a610 /src/map
parentd248e30f13ebfa13b2686fe739b8d225e2d137e5 (diff)
downloadhercules-fd7d1a9320453047e8657981ffbc92d7663b83dd.tar.gz
hercules-fd7d1a9320453047e8657981ffbc92d7663b83dd.tar.bz2
hercules-fd7d1a9320453047e8657981ffbc92d7663b83dd.tar.xz
hercules-fd7d1a9320453047e8657981ffbc92d7663b83dd.zip
Emperium can not be move by vacuum (bug:8372)
On renewal only double attack work on emperium
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c3
-rw-r--r--src/map/skill.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index cbc9b2c78..bdd1b9bc9 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3190,8 +3190,9 @@ int64 battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int64
switch (skill_id) {
#ifndef RENEWAL
case MO_TRIPLEATTACK:
-#endif
case HW_GRAVITATION:
+#endif
+ case TF_DOUBLE:
break;
default:
return 0;
diff --git a/src/map/skill.c b/src/map/skill.c
index e20a58429..67c766792 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -12194,9 +12194,11 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6
sg->limit -= 100 * tstatus->str/20;
sc_start(ss, bl, SC_VACUUM_EXTREME, 100, sg->skill_lv, sg->limit);
- if (unit->movepos(bl, sg->val1, sg->val2, 0, 0)) {
- clif->slide(bl, sg->val1, sg->val2);
- clif->fixpos(bl);
+ if ( !map_flag_gvg(bl->m) && !map->list[bl->m].flag.battleground && !is_boss(bl) ) {
+ if (unit->movepos(bl, sg->val1, sg->val2, 0, 0)) {
+ clif->slide(bl, sg->val1, sg->val2);
+ clif->fixpos(bl);
+ }
}
}
break;