summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt2
-rw-r--r--src/map/clif.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 951cf61a2..e5759fc06 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
01/05
+ * Reset all skill variables if the skill fails so certain skills can't be
+ abused (such as Warp, thanks to Alex14 for pointing it out) [celest]
* Added /mapflag/noreturn.txt for disabling butterfly wings (not fly wings)
[celest]
* Fixed skill_require_db reading somehow getting corrupted if weapons usable
diff --git a/src/map/clif.c b/src/map/clif.c
index e0d76a756..af89df654 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4315,6 +4315,11 @@ int clif_skill_fail(struct map_session_data *sd,int skill_id,int type,int btype)
fd=sd->fd;
+ // reset all variables [celest]
+ sd->skillx = sd->skilly = -1;
+ sd->skillid = sd->skilllv = -1;
+ sd->skillitem = sd->skillitemlv = -1;
+
if(type==0x4 && battle_config.display_delay_skill_fail==0){
return 0;
}