- The check that blocks the skill AL_TELEPORT on noteleport maps will be overriden when you use Flywings/Butterfly wings, so B Wings are usable again in noteleport maps.

- Removed a fd check in foreachinmovearea, which explains why autotraders sometimes were invisible to people who walked within sight of them
- Corrected the ignore list sorting function to account for entries with no names so they are sent to the end, not the beginning.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 6bd17dec0..8cb9a35c5 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -876,7 +876,8 @@ int skillnotok (int skillid, struct map_session_data *sd)
 			return 0;
 		break;
 		case AL_TELEPORT:
-			if(map[m].flag.noteleport) {
+			//Flywing/ButterflyWing are checked elsewhere
+			if(map[m].flag.noteleport && sd->skillitem != skillid) {
 				clif_skill_teleportmessage(sd,0);
 				return 1;
 			}
@@ -3945,8 +3946,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			mob_target(dstmd,src,0);
 		}
 		if (i) {
-			status_heal(src, 0, i, 3);
 			clif_skill_nodamage(src,bl,skillid,skilllv,0);
+			status_heal(src, 0, i, 3);
 		}
 		break;