Merge branch 'fixes'

4 years ago · 000fdfb5d7
parent 17d84c5925
commit 000fdfb5d7
1 changed files with 5 additions and 8 deletions
--- a/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/ryzom/server/src/entities_game_service/player_manager/character.cpp
@ -7789,14 +7789,11 @@ void CCharacter::setAnimalName(uint8 petIndex, ucstring customName)
 	animal.setCustomName(customName);
 	sendPetCustomNameToClient(petIndex);

-	if (!customName.empty())
-	{
-		TDataSetRow row = animal.SpawnedPets;
-		NLNET::CMessage msgout("CHARACTER_NAME");
-		msgout.serial(row);
-		msgout.serial(customName);
-		sendMessageViaMirror("IOS", msgout);
-	}
+	TDataSetRow row = animal.SpawnedPets;
+	NLNET::CMessage msgout("CHARACTER_NAME");
+	msgout.serial(row);
+	msgout.serial(customName);
+	sendMessageViaMirror("IOS", msgout);
 }

 //-----------------------------------------------------------------------------