From ed4e88c7737a501e73b2c334205a9c390fafdefd Mon Sep 17 00:00:00 2001 From: Ulukyn Date: Tue, 3 Dec 2019 14:58:51 +0100 Subject: [PATCH] Fixed: replace nlassert by return to prevent crash of EGS --- .../src/entities_game_service/game_item_manager/game_item.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp index 7ca4ebe63..c33ab2d2a 100644 --- a/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp +++ b/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp @@ -1220,7 +1220,9 @@ CGameItemPtr CGameItem::getItemCopy() //----------------------------------------------- uint32 CGameItem::sendNameId(CCharacter * user) { - nlassert( _Form != 0 ); + if (!_Form) + return 0; + if( _Form->Family != ITEMFAMILY::SCROLL_R2 ) { if ( ! _PhraseId.empty() )