Core/PacketIO: Reduce differences between branches

(cherry picked from commit 2fee7d1)

Author: joschiwald

src/server/game/Battlefield/Battlefield.cpp

@@ -452,19 +452,19 @@ void Battlefield::SendInitWorldStatesTo(Player* player)
 {
     WorldPackets::WorldState::InitWorldStates packet;
     packet.MapID = m_MapId;
-    packet.ZoneID = m_ZoneId;
-    packet.AreaID = player->GetAreaId();
+    packet.AreaID = m_ZoneId;
+    packet.SubareaID = player->GetAreaId();
     FillInitialWorldStates(packet);
 
     player->SendDirectMessage(packet.Write());
 }
 
-void Battlefield::SendUpdateWorldState(uint32 field, uint32 value)
+void Battlefield::SendUpdateWorldState(uint32 variable, uint32 value)
 {
-    for (uint8 i = 0; i < PVP_TEAMS_COUNT; ++i)
-        for (auto itr = m_players[i].begin(); itr != m_players[i].end(); ++itr)
-            if (Player* player = ObjectAccessor::FindPlayer(*itr))
-                player->SendUpdateWorldState(field, value);
+    WorldPackets::WorldState::UpdateWorldState worldstate;
+    worldstate.VariableID = variable;
+    worldstate.Value = value;
+    BroadcastPacketToZone(worldstate.Write());
 }
 
 void Battlefield::RegisterZone(uint32 zoneId)

src/server/game/Battlefield/Battlefield.h

@@ -231,7 +231,7 @@ class TC_GAME_API Battlefield : public ZoneScript
         void SendInitWorldStatesTo(Player* player);
 
         /// Update data of a worldstate to all players present in zone
-        void SendUpdateWorldState(uint32 field, uint32 value);
+        void SendUpdateWorldState(uint32 variable, uint32 value);
 
         /**
          * \brief Called every time for update bf data and time

src/server/game/Battlegrounds/Battleground.cpp

@@ -574,14 +574,14 @@ Position const* Battleground::GetTeamStartPosition(TeamId teamId) const
     return &StartPosition[teamId];
 }
 
-void Battleground::SendPacketToAll(WorldPacket const* packet)
+void Battleground::SendPacketToAll(WorldPacket const* packet) const
 {
     for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
         if (Player* player = _GetPlayer(itr, "SendPacketToAll"))
             player->SendDirectMessage(packet);
 }
 
-void Battleground::SendPacketToTeam(uint32 TeamID, WorldPacket const* packet, Player* sender, bool self)
+void Battleground::SendPacketToTeam(uint32 TeamID, WorldPacket const* packet, Player* sender, bool self) const
 {
     for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {

src/server/game/Battlegrounds/Battleground.h

@@ -377,8 +377,8 @@ class TC_GAME_API Battleground
         // Packet Transfer
         // method that should fill worldpacket with actual world states (not yet implemented for all battlegrounds!)
         virtual void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& /*packet*/) { }
-        void SendPacketToTeam(uint32 TeamID, WorldPacket const* packet, Player* sender = nullptr, bool self = true);
-        void SendPacketToAll(WorldPacket const* packet);
+        void SendPacketToTeam(uint32 TeamID, WorldPacket const* packet, Player* sender = nullptr, bool self = true) const;
+        void SendPacketToAll(WorldPacket const* packet) const;
 
         void SendChatMessage(Creature* source, uint8 textId, WorldObject* target = nullptr);
         void SendBroadcastText(uint32 id, ChatMsg msgType, WorldObject const* target = nullptr);

src/server/game/Entities/Player/Player.cpp

@@ -8527,8 +8527,8 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId)
 
     WorldPackets::WorldState::InitWorldStates packet;
     packet.MapID = mapId;
-    packet.ZoneID = zoneId;
-    packet.AreaID = areaId;
+    packet.AreaID = zoneId;
+    packet.SubareaID = areaId;
 
     packet.Worldstates.emplace_back(2264, 0); // SCOURGE_EVENT_WORLDSTATE_EASTERN_PLAGUELANDS
     packet.Worldstates.emplace_back(2263, 0); // SCOURGE_EVENT_WORLDSTATE_TANARIS

src/server/game/Server/Packets/WorldStatePackets.cpp

@@ -17,15 +17,15 @@
 
 #include "WorldStatePackets.h"
 
-WorldPackets::WorldState::InitWorldStates::InitWorldStates() : ServerPacket(SMSG_INIT_WORLD_STATES, 4 + 4 + 4 + 2) { }
-
-WorldPacket const* WorldPackets::WorldState::InitWorldStates::Write()
+namespace WorldPackets::WorldState
+{
+WorldPacket const* InitWorldStates::Write()
 {
     _worldPacket.reserve(4 + 4 + 4 + 2 + Worldstates.size() * 8);
 
     _worldPacket << int32(MapID);
-    _worldPacket << int32(ZoneID);
     _worldPacket << int32(AreaID);
+    _worldPacket << int32(SubareaID);
 
     _worldPacket << uint16(Worldstates.size());
     for (WorldStateInfo const& wsi : Worldstates)
@@ -37,10 +37,11 @@ WorldPacket const* WorldPackets::WorldState::InitWorldStates::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::WorldState::UpdateWorldState::Write()
+WorldPacket const* UpdateWorldState::Write()
 {
     _worldPacket << int32(VariableID);
     _worldPacket << int32(Value);
 
     return &_worldPacket;
 }
+}

src/server/game/Server/Packets/WorldStatePackets.h

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WorldStatePackets_h__
-#define WorldStatePackets_h__
+#ifndef TRINITYCORE_WORLD_STATE_PACKETS_H
+#define TRINITYCORE_WORLD_STATE_PACKETS_H
 
 #include "Packet.h"
 
@@ -29,19 +29,20 @@ namespace WorldPackets
         public:
             struct WorldStateInfo
             {
-                WorldStateInfo(int32 variableID, int32 value) : VariableID(variableID), Value(value) { }
+                WorldStateInfo(int32 variableID, int32 value)
+                    : VariableID(variableID), Value(value) { }
 
                 int32 VariableID;
                 int32 Value;
             };
 
-            InitWorldStates();
+            explicit InitWorldStates() : ServerPacket(SMSG_INIT_WORLD_STATES, 4 + 4 + 4 + 2) { }
 
             WorldPacket const* Write() override;
 
-            int32 MapID = 0;
-            int32 ZoneID = 0;
-            int32 AreaID = 0;
+            int32 AreaID    = 0; ///< ZoneId
+            int32 SubareaID = 0; ///< AreaId
+            int32 MapID     = 0; ///< MapId
 
             std::vector<WorldStateInfo> Worldstates;
         };
@@ -59,4 +60,4 @@ namespace WorldPackets
     }
 }
 
-#endif // WorldStatePackets_h__
+#endif // TRINITYCORE_WORLD_STATE_PACKETS_H