--- deliantra/server/socket/item.C	2007/10/19 04:25:10	1.54
+++ deliantra/server/socket/item.C	2007/11/26 11:41:02	1.56
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /**
@@ -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