summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ecb19550c..0e6bf9ee4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+09/08/21
+ * Fixed Teleport through Hocus-Pocus skips menu. (bugreport:3513) [Inkfish]
09/08/20
* Added bMagicHPGainValue and bMagicSPGainValue. [Inkfish]
* Fixed the wrong packet length makes client choke when add_quest packets are sent. [Inkfish]
diff --git a/src/map/skill.c b/src/map/skill.c
index 1ed612dee..f3d80ba0b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4408,7 +4408,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break;
}
- if( sd->state.autocast || sd->skillitem == AL_TELEPORT || (battle_config.skip_teleport_lv1_menu && skilllv == 1) || skilllv > 2 )
+ if( sd->state.autocast || ( (sd->skillitem == AL_TELEPORT || battle_config.skip_teleport_lv1_menu) && skilllv == 1 ) || skilllv == 3 )
{
if( skilllv == 1 )
pc_randomwarp(sd,3);