From 3a6906cbc2a169de193a442d88040dd82b36d585 Mon Sep 17 00:00:00 2001
From: amibu <fakecake@icloud.com>
Date: Fri, 6 Oct 2017 00:22:08 +0200
Subject: [PATCH] Stuff I forgot

---
 src/servers/Server_Common/Network/PacketDef/Ipcs.h        | 2 +-
 .../Server_Common/Network/PacketDef/Zone/ServerZoneDef.h  | 2 +-
 src/servers/Server_Zone/Actor/Player.cpp                  | 2 +-
 src/servers/Server_Zone/Actor/PlayerSql.cpp               | 2 +-
 .../Server_Zone/DebugCommand/DebugCommandHandler.cpp      | 8 +-------
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/servers/Server_Common/Network/PacketDef/Ipcs.h b/src/servers/Server_Common/Network/PacketDef/Ipcs.h
index fd5fdbd1..3ee418d8 100644
--- a/src/servers/Server_Common/Network/PacketDef/Ipcs.h
+++ b/src/servers/Server_Common/Network/PacketDef/Ipcs.h
@@ -118,7 +118,7 @@ namespace Packets {
 
       EorzeaTimeOffset           = 0x01B4,
 
-      CharaGearParams            = 0x01C0,
+      EquipDisplayFlags            = 0x01C0,
 
       CFAvailableContents        = 0x01CF,
 
diff --git a/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h b/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
index dca98e03..9726addf 100644
--- a/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1290,7 +1290,7 @@ struct FFXIVIpcEorzeaTimeOffset : FFXIVIpcBasePacket<EorzeaTimeOffset>
 * Structural representation of the packet sent by the server
 * to set the gear show/hide status of a character
 */
-struct FFXIVIpcCharaGearParams : FFXIVIpcBasePacket<CharaGearParams>
+struct FFXIVIpcEquipDisplayFlags : FFXIVIpcBasePacket<EquipDisplayFlags>
 {
    uint8_t bitmask;
 };
diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp
index 2aa7e12e..e407b214 100644
--- a/src/servers/Server_Zone/Actor/Player.cpp
+++ b/src/servers/Server_Zone/Actor/Player.cpp
@@ -1429,7 +1429,7 @@ void Core::Entity::Player::setTitle( uint16_t titleId )
 void Core::Entity::Player::setEquipDisplayFlags( uint8_t state )
 {
    m_equipDisplayFlags = state;
-   GamePacketNew< FFXIVIpcCharaGearParams, ServerZoneIpcType > paramPacket( getId() );
+   GamePacketNew< FFXIVIpcEquipDisplayFlags, ServerZoneIpcType > paramPacket( getId() );
    paramPacket.data().bitmask = m_equipDisplayFlags;
    sendToInRangeSet( paramPacket, true );
    setSyncFlag( PlayerSyncFlags::Status );
diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp
index b99e9db2..d8cf4194 100644
--- a/src/servers/Server_Zone/Actor/PlayerSql.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp
@@ -90,7 +90,7 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
 
    if( !pQR )
    {
-      g_log.error( "[SQL] Failed loading Player ID " + char_id_str );
+      g_log.error( "[DB] Failed loading Player ID " + char_id_str );
       return false;
    }
 
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
index ca594515..acfbad2c 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
@@ -375,13 +375,7 @@ void Core::DebugCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlaye
    }
    else
    {
-      int32_t opcode;
-      sscanf(params.c_str(), "%x", &opcode);
-
-      Network::Packets::GamePacketNew<Network::Packets::Server::FFXIVIpcCharaGearParams, Network::Packets::ServerZoneIpcType > paramPacket(pPlayer->getId());
-      paramPacket.data().bitmask = opcode;
-      pPlayer->sendToInRangeSet(paramPacket, true);
-      pPlayer->sendUrgent( subCommand + " is not a valid ADD command." + std::to_string(opcode) );
+      pPlayer->sendUrgent( subCommand + " is not a valid ADD command." );
    }