From aaccb4bd6a154f130e43fac2022329bb4100b295 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 2 Feb 2020 19:49:16 +0900
Subject: [PATCH] clean up

---
 src/scripts/action/war/ActionMaim37.cpp       | 1 -
 src/scripts/action/war/ActionStormsEye45.cpp  | 1 -
 src/scripts/action/war/ActionStormsPath42.cpp | 1 -
 src/world/Actor/Player.cpp                    | 5 ++++-
 src/world/Actor/Player.h                      | 6 ++++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/scripts/action/war/ActionMaim37.cpp b/src/scripts/action/war/ActionMaim37.cpp
index 63df4928..b0537507 100644
--- a/src/scripts/action/war/ActionMaim37.cpp
+++ b/src/scripts/action/war/ActionMaim37.cpp
@@ -22,7 +22,6 @@ public:
     uint8_t ib = pPlayer->gaugeWarGetIb();
     ib = std::min( 100, ib + 10 );
     pPlayer->gaugeWarSetIb( ib );
-    pPlayer->sendActorGuage();
   }
 };
 
diff --git a/src/scripts/action/war/ActionStormsEye45.cpp b/src/scripts/action/war/ActionStormsEye45.cpp
index 6ca6d9a5..567110a9 100644
--- a/src/scripts/action/war/ActionStormsEye45.cpp
+++ b/src/scripts/action/war/ActionStormsEye45.cpp
@@ -22,7 +22,6 @@ public:
     uint8_t ib = pPlayer->gaugeWarGetIb();
     ib = std::min( 100, ib + 10 );
     pPlayer->gaugeWarSetIb( ib );
-    pPlayer->sendActorGuage();
   }
 };
 
diff --git a/src/scripts/action/war/ActionStormsPath42.cpp b/src/scripts/action/war/ActionStormsPath42.cpp
index 27b7576f..51b113f1 100644
--- a/src/scripts/action/war/ActionStormsPath42.cpp
+++ b/src/scripts/action/war/ActionStormsPath42.cpp
@@ -22,7 +22,6 @@ public:
     uint8_t ib = pPlayer->gaugeWarGetIb();
     ib = std::min( 100, ib + 20 );
     pPlayer->gaugeWarSetIb( ib );
-    pPlayer->sendActorGuage();
   }
 };
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index d33910b7..7f37a025 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -2161,6 +2161,7 @@ void Sapphire::Entity::Player::gaugeClear()
   std::memset( m_gauge, 0, sizeof( m_gauge ) );
   auto pPacket = makeZonePacket< FFXIVIpcEffect037F >( getId() );
   queuePacket( pPacket );
+  sendActorGauge();
 }
 
 void Sapphire::Entity::Player::gaugeSet( uint8_t index, uint8_t value )
@@ -2173,7 +2174,7 @@ uint8_t Sapphire::Entity::Player::gaugeGet( uint8_t index )
   return m_gauge[ index ];
 }
 
-void Sapphire::Entity::Player::sendActorGuage()
+void Sapphire::Entity::Player::sendActorGauge()
 {
   auto pPacket = makeZonePacket< FFXIVIpcActorGauge >( getId() );
   pPacket->data().classJobId = static_cast< uint8_t >( getClass() );
@@ -2197,6 +2198,8 @@ void Sapphire::Entity::Player::gaugeWarSetIb( uint8_t value )
     queuePacket( pPacket );
   }
   gaugeSet( 0, value );
+  if( oldValue != value )
+    sendActorGauge();
 }
 
 uint8_t Sapphire::Entity::Player::gaugeWarGetIb()
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index bde5c546..43758ce7 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -973,10 +973,12 @@ namespace Sapphire::Entity
 
     // Job UI
     //////////////////////////////////////////////////////////////////////////////////////////////////////
-    void gaugeClear();
+    private:
     void gaugeSet( uint8_t index, uint8_t value );
     uint8_t gaugeGet( uint8_t index );
-    void sendActorGuage();
+    public:
+    void gaugeClear();
+    void sendActorGauge();
 
     void gaugeWarSetIb( uint8_t value );
     uint8_t gaugeWarGetIb();