Instructions Jenkins Doxygen

[moved] auction chat join from zone to login (fix client debug warnings) 07/1607/2
authorKlivian <klivian@hotmail.com>
Wed, 23 Apr 2014 01:04:24 +0000 (01:04 +0000)
committerKlivian <klivian@hotmail.com>
Thu, 24 Apr 2014 23:34:47 +0000 (23:34 +0000)
Change-Id: If8976bce9849b27ca34e1e44df34f0f79db8888f

MMOCoreORB/src/server/zone/objects/player/PlayerObjectImplementation.cpp
MMOCoreORB/src/server/zone/packets/zone/SelectCharacterCallback.h

index ecf0115..5939631 100644 (file)
@@ -370,15 +370,6 @@ void PlayerObjectImplementation::notifySceneReady() {
                planetChat->addPlayer(creature);
        }
 
-       // Join auction chat room
-       ChatManager* chatManager = server->getZoneServer()->getChatManager();
-       ManagedReference<ChatRoom*> auctionChat = chatManager->getAuctionRoom();
-       if( auctionChat == NULL )
-               return;
-
-       auctionChat->sendTo(creature);
-       auctionChat->addPlayer(creature);
-
        if(creature->getZone() != NULL && creature->getZone()->getPlanetManager() != NULL) {
                ManagedReference<WeatherManager*> weatherManager = creature->getZone()->getPlanetManager()->getWeatherManager();
                if(weatherManager != NULL) {
index fd6e3bb..b3a849e 100644 (file)
@@ -169,6 +169,13 @@ public:
                        chatManager->addPlayer(player);
                        chatManager->loadMail(player);
 
+                       // Join auction chat room
+                       ManagedReference<ChatRoom*> auctionChat = chatManager->getAuctionRoom();
+                       if( auctionChat != NULL ){
+                               auctionChat->sendTo(player);
+                               auctionChat->addPlayer(player);
+                       }
+
                        ghost->notifyOnline();
 
                        PlayerManager* playerManager = zoneServer->getPlayerManager();