--- deliantra/server/socket/item.C	2007/11/08 19:43:29	1.55
+++ deliantra/server/socket/item.C	2007/11/26 11:41:02	1.56
@@ -927,12 +927,22 @@
         {
           object *current, *next;
 
+          int cnt = MAX_ITEM_PER_DROP;
+
           for (current = op->inv; current != NULL; current = next)
             {
               next = current->below;
               drop_object (pl, current, 0);
+
+              if (--cnt <= 0) break;
             }
 
+          if (cnt <= 0)
+            pl->failmsg (format (
+              "Moved only %d items, you can't move more than that at once.",
+              MAX_ITEM_PER_DROP
+            ));
+
           esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else