From d66d1e8d55c61a2f7157b10ec8f262afaf5024b9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Dec 2018 21:08:38 +1100
Subject: [PATCH] fix wrong placename when buying plot and some logmessage
 cleanup

---
 .../common/housing/CmnDefHousingSignboard.cpp  | 18 +++++++-----------
 src/servers/sapphire_zone/Territory/Zone.cpp   |  5 +++++
 src/servers/sapphire_zone/Territory/Zone.h     |  2 ++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp
index 650baee8..8b0ba8e8 100644
--- a/src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -5,6 +5,7 @@
 #include <Manager/HousingMgr.h>
 #include <Network/PacketWrappers/ActorControlPacket143.h>
 #include <Network/CommonActorControl.h>
+#include <Exd/ExdDataGenerated.h>
 #include "Framework.h"
 
 
@@ -47,37 +48,32 @@ public:
           {
             auto screenMsgPkt = makeActorControl143( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 );
             player.queuePacket( screenMsgPkt );
-            auto screenMsgPkt2 = makeActorControl143( player.getId(), ActorControl::LogMsg, 0x0D16, 0x1AA,
-                                                      activeLand.ward + 1, activeLand.plot + 1 );
-            player.queuePacket( screenMsgPkt2 );
+
+            player.sendLogMessage( 0x0D16, pTerritory->getTerritoryTypeInfo()->placeName, activeLand.ward + 1, activeLand.plot + 1 );
             break;
           }
 
           case LandPurchaseResult::ERR_NOT_ENOUGH_GIL:
           {
-            auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 3314 );
-            player.queuePacket( errorMsg );
+            player.sendLogMessage( 3314 );
             break;
           }
 
           case LandPurchaseResult::ERR_NOT_AVAILABLE:
           {
-            auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 3312 );
-            player.queuePacket( errorMsg );
+            player.sendLogMessage( 3312 );
             break;
           }
 
           case LandPurchaseResult::ERR_NO_MORE_LANDS_FOR_CHAR:
           {
-            auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 3313 );
-            player.queuePacket( errorMsg );
+            player.sendLogMessage( 3313 );
             break;
           }
 
           case LandPurchaseResult::ERR_INTERNAL:
           {
-            auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 1995 );
-            player.queuePacket( errorMsg );
+            player.sendLogMessage( 1995 );
             break;
           }
         }
diff --git a/src/servers/sapphire_zone/Territory/Zone.cpp b/src/servers/sapphire_zone/Territory/Zone.cpp
index 2c37892a..eedbe037 100644
--- a/src/servers/sapphire_zone/Territory/Zone.cpp
+++ b/src/servers/sapphire_zone/Territory/Zone.cpp
@@ -756,3 +756,8 @@ Sapphire::Entity::EventObjectPtr Sapphire::Zone::registerEObj( const std::string
 
   return eObj;
 }
+
+Sapphire::Data::TerritoryTypePtr Sapphire::Zone::getTerritoryTypeInfo() const
+{
+  return m_territoryTypeInfo;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Territory/Zone.h b/src/servers/sapphire_zone/Territory/Zone.h
index 717973a2..132b797d 100644
--- a/src/servers/sapphire_zone/Territory/Zone.h
+++ b/src/servers/sapphire_zone/Territory/Zone.h
@@ -76,6 +76,8 @@ namespace Sapphire
 
     void setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId = 0 );
 
+    std::shared_ptr< Data::TerritoryType > getTerritoryTypeInfo() const;
+
     virtual bool init();
 
     virtual void loadCellCache();