3 files changed, 6 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 9336adb6c..16187cc46 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3494,7 +3494,6 @@ static const struct battle_data_short {
 	{ "atcommand_slave_clone_limit",       &battle_config.atc_slave_clone_limit},
 	{ "partial_name_scan",                 &battle_config.partial_name_scan	},
 	{ "gm_all_skill",                      &battle_config.gm_allskill				},
-	{ "gm_all_skill_add_abra",	            &battle_config.gm_allskill_addabra		},
 	{ "gm_all_equipment",                  &battle_config.gm_allequip				},
 	{ "gm_skill_unconditional",            &battle_config.gm_skilluncond			},
 	{ "gm_join_chat",                      &battle_config.gm_join_chat				},
diff --git a/src/map/battle.h b/src/map/battle.h
index fc6b685fb..364553ebd 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -136,7 +136,6 @@ extern struct Battle_Config {
 	unsigned short atc_slave_clone_limit;
 	unsigned short partial_name_scan;
 	unsigned short gm_allskill;
-	unsigned short gm_allskill_addabra;
 	unsigned short gm_allequip;
 	unsigned short gm_skilluncond;
 	unsigned short gm_join_chat;
diff --git a/src/map/skill.c b/src/map/skill.c
index 98a4e2dc8..8802a3678 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9288,7 +9288,9 @@ int skill_landprotector (struct block_list *bl, va_list ap)
 			}
 			//Delete the rest of types.
 		case HW_GANBANTEIN:
-			if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
+			//Update: It deletes everything except songs/dances/encores.
+			if(!unit->group->state.song_dance)
+//			if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
 			{	//Delete Magical effects
 				skill_delunit(unit, 1);
 				return 1;
@@ -9319,7 +9321,9 @@ int skill_landprotector (struct block_list *bl, va_list ap)
 			break;
 	}
 	if (unit->group->skill_id == SA_LANDPROTECTOR &&
-		skill_get_type(skillid) == BF_MAGIC)
+	//Update: It deletes everything except songs/dances/encores.
+		!(skill_get_inf2(skillid)&(UF_DANCE|UF_SONG|UF_ENSEMBLE)))
+//		skill_get_type(skillid) == BF_MAGIC)
 	{	//Magic tile won't be activated
 		(*alive) = 0;
 		return 1;