- Added a fix for Abracadabra, this skills allways should use minimum a Yellow Gem.

- Added some code "suggestion" to handle the new Barricades, please test it with:
- @barricade <x> <y> <size> <direction> <killable> <Event Name>
- @killbarricade <Event Name>
- If x and y are -1, it will use your current position.
- Direction 0 Vertical 1 Horizontal.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12352 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 9 insertions, 1 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 1c1b1ab7c..d1e230247 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1236,10 +1236,13 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in
 	switch (target->type)
 	{
 		case BL_MOB:
-			if (((TBL_MOB*)target)->class_ == MOBID_EMPERIUM)
+		{
+			struct mob_data* md = BL_CAST(BL_MOB, target);
+			if( md->class_ == MOBID_EMPERIUM || md->class_ == MOBID_BARRICADEA || md->class_ == MOBID_BARRICADEB )
 				return 0;
 			if(src != target && is_boss(target)) //Bosses can't be knocked-back
 				return 0;
+		}
 			break;
 		case BL_PC:
 			if(src != target && ((TBL_PC*)target)->special_state.no_knockback)
@@ -8111,7 +8114,12 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 						continue;
 				}
 				if(sc && sc->data[SC_INTOABYSS])
+				{
+					if( skill != SA_ABRACADABRA )
 					continue;
+					else if( --amount[i] < 1 )
+						amount[i] = 1; // Hocus Pocus allways use at least 1 gem
+				}
 			}
 
 			if((skill == AM_POTIONPITCHER ||