4 files changed, 4 insertions, 8 deletions
diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt
index 7ca9c587..284209c0 100644
--- a/world/map/npc/magic/level2-barrier.txt
+++ b/world/map/npc/magic/level2-barrier.txt
@@ -5,8 +5,7 @@
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if   (.@level <= 3 && countitem("SmallMushroom") < 1) end;
-    elif (.@level <= 3) end;
+    if (.@level <= 3 && countitem("SmallMushroom") < 1) end;
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1)
         set @target_id, BL_ID; // fallback to self
diff --git a/world/map/npc/magic/level2-flying-backpack.txt b/world/map/npc/magic/level2-flying-backpack.txt
index b3013db0..f8857120 100644
--- a/world/map/npc/magic/level2-flying-backpack.txt
+++ b/world/map/npc/magic/level2-flying-backpack.txt
@@ -5,8 +5,7 @@
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if   (.@level <= 3 && countitem("SilkCocoon") < 1) end;
-    elif (.@level <= 3) end;
+    if (.@level <= 3 && countitem("SilkCocoon") < 1) end;
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1)
         set @target_id, BL_ID; // fallback to self
diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt
index d46577a0..98380d7b 100644
--- a/world/map/npc/magic/level2-protect.txt
+++ b/world/map/npc/magic/level2-protect.txt
@@ -5,8 +5,7 @@
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if   (.@level <= 3 && countitem("HardSpike") < 1) end;
-    elif (.@level <= 3) end;
+    if (.@level <= 3 && countitem("HardSpike") < 1) end;
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id))
         set @target_id, BL_ID; // fallback to self
diff --git a/world/map/npc/magic/level2-rain.txt b/world/map/npc/magic/level2-rain.txt
index 7d642425..89ded96d 100644
--- a/world/map/npc/magic/level2-rain.txt
+++ b/world/map/npc/magic/level2-rain.txt
@@ -7,8 +7,7 @@ OnCast:
     if(call("magic_checks")) end;
     if (getskilllv(.school) < .level) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if   (getskilllv(.school) < 4 && countitem("BottleOfWater") < 1) end;
-    elif (getskilllv(.school) < 4) end;
+    if (getskilllv(.school) < 4 && countitem("BottleOfWater") < 1) end;
     if (Sp < 17) end;
     explode .@map_ext[0], getmap(), "-";
     if (.@map_ext[1] != 1 && getmap() != "099-5") end; // XXX this is fugly, in the future let's use MF_OUTSIDE to detect if a map is "outside" or "inside"