[PlaneShift-svn] SF.net SVN: planeshift:[4048] trunk/src/server/usermanager.cpp

[<wel...@us...>]

Revision: 4048
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4048&view=rev
Author:   weltall2
Date:     2009-07-17 10:57:25 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Fixed PS#2820 - Bad error message

Modified Paths:
--------------
    trunk/src/server/usermanager.cpp

Modified: trunk/src/server/usermanager.cpp
===================================================================
--- trunk/src/server/usermanager.cpp	2009-07-17 09:33:32 UTC (rev 4047)
+++ trunk/src/server/usermanager.cpp	2009-07-17 10:57:25 UTC (rev 4048)
@@ -1862,20 +1862,24 @@
         if (eID.IsValid())
         {
             object = gem->FindObject(eID);
-            if (object && object->GetItem())
+            if (object)
             {
-                object->SendBehaviorMessage("pickup", client->GetActor() );
+                if(object->GetItem())
+                    object->SendBehaviorMessage("pickup", client->GetActor() );
+                else
+                    psserver->SendSystemError(client->GetClientNum(),
+                                "You can't pickup objects which aren't items");
             }
             else
             {
                 psserver->SendSystemError(client->GetClientNum(),
-                                "Item not found %s", target.GetData());
+                                "Object not found %s", target.GetData());
             }
         }
     }
     else
         psserver->SendSystemError(client->GetClientNum(),
-                "Item not found %s", target.GetData());
+                "Object not found %s", target.GetData());
 }
 
 void UserManager::HandleMount(psUserCmdMessage& msg, Client *client)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.