From 000fdfb5d7db0be99e30f590870d8ae7d6d3692b Mon Sep 17 00:00:00 2001 From: Nuno Date: Fri, 25 Dec 2020 00:48:07 +0100 Subject: [PATCH] Merge branch 'fixes' --- .../player_manager/character.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ryzom/server/src/entities_game_service/player_manager/character.cpp b/ryzom/server/src/entities_game_service/player_manager/character.cpp index e4e42d607..aa1582780 100644 --- 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); } //-----------------------------------------------------------------------------