From 2ecb30abb20ccba0b58c588971b703f869e51845 Mon Sep 17 00:00:00 2001
From: Daegaladh <Daegaladh@users.noreply.github.com>
Date: Fri, 16 Feb 2018 01:00:11 +0100
Subject: [PATCH] Fixed AL_HOLYWATER behavior (#2860)

* Fixes #2853.
* Holy Water should not cast or consume SP when the player has no empty bottles, both in water (and water skills) and outside water.
Thanks to @Daegaladh!
---
 src/map/skill.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 6322afb913..2d95d8dcd8 100755
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -14967,6 +14967,12 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
 				return false;
 			}
 			break;
+		case AL_HOLYWATER:
+			if(pc_search_inventory(sd,ITEMID_EMPTY_BOTTLE) < 0) {
+				clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
+				return false;
+			}
+			break;
 		case MO_CALLSPIRITS:
 			if(sc && sc->data[SC_RAISINGDRAGON])
 				skill_lv += sc->data[SC_RAISINGDRAGON]->val1;