From 26a80fbcc6fd76ed0b4759b10bc81c1c8e5001bc Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 28 Nov 2017 17:16:12 +0100
Subject: [PATCH] Refactoring of event name generation

---
 src/servers/Server_Zone/Event/EventHelper.cpp | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/servers/Server_Zone/Event/EventHelper.cpp b/src/servers/Server_Zone/Event/EventHelper.cpp
index 18308399..e59b322b 100644
--- a/src/servers/Server_Zone/Event/EventHelper.cpp
+++ b/src/servers/Server_Zone/Event/EventHelper.cpp
@@ -12,47 +12,45 @@ std::string Core::Event::getEventName( uint32_t eventId )
 {
    uint16_t eventType = eventId >> 16;
 
+   auto unknown = std::string{ "unknown" };
+
    switch( eventType )
    {
    case EventType::Quest:
    {
       auto questInfo = g_exdData.getQuestInfo( eventId );
-      if( questInfo )
-      {
-         std::string name = questInfo->name_intern;
-         std::size_t pos = name.find_first_of( "_" );
+      if( !questInfo )
+         return unknown + "Quest";
 
-         return questInfo->name_intern.substr( 0, pos );
-      }
+      std::string name = questInfo->name_intern;
+      std::size_t pos = name.find_first_of( "_" );
+
+      return questInfo->name_intern.substr( 0, pos );
    }
-   break;
    case EventType::CustomTalk:
    {
       auto customTalkInfo = g_exdData.getCustomTalkInfo( eventId );
-      if( customTalkInfo )
-      {
-         std::string name = customTalkInfo->name_intern;
-         std::size_t pos = name.find_first_of( "_" );
+      if( !customTalkInfo )
+         return unknown + "CustomTalk";
 
-         return customTalkInfo->name_intern.substr( 0, pos );
-      }
+      std::string name = customTalkInfo->name_intern;
+      std::size_t pos = name.find_first_of( "_" );
 
+      return customTalkInfo->name_intern.substr( 0, pos );
    }
-   break;
    case EventType::Opening:
    {
       auto openingInfo = g_exdData.getOpeningInfo( eventId );
       if( openingInfo )
          return openingInfo->name;
+      return unknown + "Opening";
    }
-   break;
    case EventType::Aetheryte:
    {
       auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF );
       if( aetherInfo->isAetheryte )
          return "Aetheryte";
       return "Aethernet";
-      
    }
    case EventType::ChocoPort:
    {
@@ -60,11 +58,9 @@ std::string Core::Event::getEventName( uint32_t eventId )
    }
    default:
    {
-      return "";
-
+      return unknown;
    }
    }
-   return "";
 }
 
 uint32_t Core::Event::mapEventActorToRealActor( uint32_t eventActorId )