From 3486c5d3ad000b9c4efd5949ebfee7d9699de209 Mon Sep 17 00:00:00 2001 From: JeidoUran Date: Fri, 4 Jan 2019 05:12:06 +0100 Subject: [PATCH 1/5] "!add bnpc" no longer crashes world.exe if a non-existing bnpctemplate is inputted --- src/world/Manager/DebugCommandMgr.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index 63b3d53a..e84fd649 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -429,8 +429,10 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& auto bNpcTemplate = serverZone->getBNpcTemplate( params ); if( !bNpcTemplate ) + { player.sendNotice( "Template " + params + " not found in cache!" ); - + return; + } auto pBNpc = std::make_shared< Entity::BNpc >( bNpcTemplate, player.getPos().x, player.getPos().y, From b99ad7822331aa258e6277c74d5b10df711661d4 Mon Sep 17 00:00:00 2001 From: JeidoUran Date: Fri, 4 Jan 2019 13:30:14 +0100 Subject: [PATCH 2/5] Update DebugCommandMgr.cpp --- src/world/Manager/DebugCommandMgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index e84fd649..fb0abf7f 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -429,10 +429,10 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& auto bNpcTemplate = serverZone->getBNpcTemplate( params ); if( !bNpcTemplate ) - { + { player.sendNotice( "Template " + params + " not found in cache!" ); - return; - } + return; + } auto pBNpc = std::make_shared< Entity::BNpc >( bNpcTemplate, player.getPos().x, player.getPos().y, @@ -1047,4 +1047,4 @@ void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Pla { player.sendDebug( "Unknown sub command." ); } -} \ No newline at end of file +} From 4dabec79d4cd72c35271d83fa21818267bbedfa1 Mon Sep 17 00:00:00 2001 From: JeidoUran Date: Fri, 4 Jan 2019 13:47:03 +0100 Subject: [PATCH 3/5] Formatting --- src/world/Manager/DebugCommandMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index fb0abf7f..876557a9 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -430,7 +430,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& if( !bNpcTemplate ) { - player.sendNotice( "Template " + params + " not found in cache!" ); + player.sendNotice( "Template " + params + " not found in cache!" ); return; } auto pBNpc = std::make_shared< Entity::BNpc >( bNpcTemplate, From a3b738d72458a5a4a1d101b4b8ae952b3f42e22b Mon Sep 17 00:00:00 2001 From: JeidoUran Date: Fri, 4 Jan 2019 13:50:57 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Formatting=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/world/Manager/DebugCommandMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index 876557a9..ef01f066 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -429,10 +429,10 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& auto bNpcTemplate = serverZone->getBNpcTemplate( params ); if( !bNpcTemplate ) - { + { player.sendNotice( "Template " + params + " not found in cache!" ); - return; - } + return; + } auto pBNpc = std::make_shared< Entity::BNpc >( bNpcTemplate, player.getPos().x, player.getPos().y, From c87955374e5b7704507cd6e32395c43c712445ba Mon Sep 17 00:00:00 2001 From: JeidoUran Date: Fri, 4 Jan 2019 13:57:29 +0100 Subject: [PATCH 5/5] Formatting... --- src/world/Manager/DebugCommandMgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index ef01f066..8095da7f 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -429,10 +429,10 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& auto bNpcTemplate = serverZone->getBNpcTemplate( params ); if( !bNpcTemplate ) - { - player.sendNotice( "Template " + params + " not found in cache!" ); - return; - } + { + player.sendNotice( "Template " + params + " not found in cache!" ); + return; + } auto pBNpc = std::make_shared< Entity::BNpc >( bNpcTemplate, player.getPos().x, player.getPos().y,