--- deliantra/server/socket/item.C	2010/04/03 17:15:19	1.90
+++ deliantra/server/socket/item.C	2010/04/08 04:49:02	1.91
@@ -122,7 +122,6 @@
     flags |= F_NOPICK;
 
   ns.send_face (head->face, -50);
-  ns.flush_fx ();
 
   if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
     ns.send_animation (head->animation_id);
@@ -281,6 +280,7 @@
       // if packet got too large, send it and begin a new one
       if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
         {
+          pl->ns->flush_fx ();
           pl->ns->send_packet (sl);
 
           sl.reset ();
@@ -309,7 +309,10 @@
     }
 
   if (dirty)
-    pl->ns->send_packet (sl);
+    {
+      pl->ns->flush_fx ();
+      pl->ns->send_packet (sl);
+    }
 }
 
 /**
@@ -351,6 +354,7 @@
            */
           if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
             {
+              pl->contr->ns->flush_fx ();
               pl->contr->ns->send_packet (sl);
 
               sl.reset ();
@@ -362,7 +366,10 @@
     }
 
   if (got_one)
-    pl->contr->ns->send_packet (sl);
+    {
+      pl->contr->ns->flush_fx ();
+      pl->contr->ns->send_packet (sl);
+    }
 }
 
 /**
@@ -493,6 +500,7 @@
 
   add_object_to_socklist (*pl->contr->ns, sl, op);
 
+  pl->contr->ns->flush_fx ();
   pl->contr->ns->send_packet (sl);
 }