Instructions Jenkins Doxygen

[Fixed] /movefurniture and /rotatefurniture can no longer be used on 92/1292/1
authorIvojedi <ivojedi@swgemu.com>
Tue, 24 Dec 2013 08:31:27 +0000 (00:31 -0800)
committerIvojedi <ivojedi@swgemu.com>
Tue, 24 Dec 2013 08:31:27 +0000 (00:31 -0800)
pets or players

Change-Id: I6eddc36ae21c5d41c50c586b59fbdec5faab08cc

MMOCoreORB/src/server/zone/objects/creature/commands/MoveFurnitureCommand.h
MMOCoreORB/src/server/zone/objects/creature/commands/RotateFurnitureCommand.h

index 393bfc2..00ed0f6 100755 (executable)
@@ -81,7 +81,7 @@ public:
 
                ManagedReference<SceneObject*> obj = server->getZoneServer()->getObject(target);
 
-               if (obj == NULL || !obj->isTangibleObject()) {
+               if (obj == NULL || !obj->isTangibleObject() || obj->isPlayerCreature() || obj->isPet()) {
                        creature->sendSystemMessage("@player_structure:move_what"); //What do you want to move?
                        return GENERALERROR;
                }
@@ -102,7 +102,7 @@ public:
                BuildingObject* buildingObject = cast<BuildingObject*>( creatureParent.get());
 
                if (buildingObject == NULL || obj->getRootParent() != buildingObject || buildingObject->containsChildObject(obj)) {
-                       creature->sendSystemMessage("@player_structure:rotate_what"); //What do you want to rotate?
+                       creature->sendSystemMessage("@player_structure:move_what"); //What do you want to move?
                        return GENERALERROR;
                }
 
index 60981ed..2e06708 100755 (executable)
@@ -103,7 +103,7 @@ public:
                ZoneServer* zoneServer = creature->getZoneServer();
                ManagedReference<SceneObject*> obj = zoneServer->getObject(target);
 
-               if (obj == NULL) {
+               if (obj == NULL || !obj->isTangibleObject() || obj->isPlayerCreature() || obj->isPet()) {
                        creature->sendSystemMessage("@player_structure:rotate_what"); //What do you want to rotate?
                        return GENERALERROR;
                }