--- deliantra/server/server/attack.C	2016/11/16 23:42:02	1.150
+++ deliantra/server/server/attack.C	2016/11/17 04:49:22	1.151
@@ -139,12 +139,12 @@
       if (!op)
         return;
 
-      /* Hacked the following so that type LIGHTER will work. 
-       * Also, objects which are potential "lights" that are hit by 
-       * flame/elect attacks will be set to glow. "lights" are any 
-       * object with +/- glow_radius and an "other_arch" to change to. 
-       * (and please note that we cant fail our save and reach this 
-       * function if the object doesnt contain a material that can burn. 
+      /* Hacked the following so that type LIGHTER will work.
+       * Also, objects which are potential "lights" that are hit by
+       * flame/elect attacks will be set to glow. "lights" are any
+       * object with +/- glow_radius and an "other_arch" to change to.
+       * (and please note that we cant fail our save and reach this
+       * function if the object doesnt contain a material that can burn.
        * So forget lighting magical swords on fire with this!) -b.t.
        */
       if (type & (AT_FIRE | AT_ELECTRICITY))
@@ -1036,14 +1036,14 @@
     if (op->speed < 10.0)
       {
         /* Stop arrow */
-        if (!container)
+        if (container)
+          container->destroy ();
+        else
           {
             hitter = fix_stopped_arrow (hitter);
             if (!hitter)
               return 0;
           }
-        else
-          container->destroy ();
 
         /* Try to stick arrow into victim */
         if (!victim->destroyed () && stick_arrow (hitter, victim))