Merge pull request #14722 from myran2/6.x

Updated implementation of userlist packets

2 files changed, 5 insertions, 8 deletions

diff --git a/src/server/game/Server/Packets/ChannelPackets.h b/src/server/game/Server/Packets/ChannelPackets.h
index 6c43588e86a..8dba1e84677 100644
--- a/src/server/game/Server/Packets/ChannelPackets.h
+++ b/src/server/game/Server/Packets/ChannelPackets.h
@@ -104,8 +104,8 @@ namespace WorldPackets
 
             ObjectGuid AddedUserGUID;
 
-            ChannelFlags ChannelFlags = CHANNEL_FLAG_NONE;
-            ChannelMemberFlags UserFlags = MEMBER_FLAG_NONE;
+            uint8 ChannelFlags = CHANNEL_FLAG_NONE;
+            uint8 UserFlags = MEMBER_FLAG_NONE;
 
             int32 ChannelID = 0;
 
@@ -121,7 +121,7 @@ namespace WorldPackets
 
             ObjectGuid RemovedUserGUID;
 
-            ChannelFlags ChannelFlags = CHANNEL_FLAG_NONE;
+            uint8 ChannelFlags = CHANNEL_FLAG_NONE;
 
             uint32 ChannelID = 0;
 
@@ -137,8 +137,8 @@ namespace WorldPackets
 
             ObjectGuid UpdatedUserGUID;
 
-            ChannelFlags ChannelFlags = CHANNEL_FLAG_NONE;
-            ChannelMemberFlags UserFlags = MEMBER_FLAG_NONE;
+            uint8 ChannelFlags = CHANNEL_FLAG_NONE;
+            uint8 UserFlags = MEMBER_FLAG_NONE;
 
             int32 ChannelID = 0;
 
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 6cfa8202af4..bd4fefdd665 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -171,9 +171,6 @@ namespace WorldPackets
         class ChannelPlayerCommand;
         class JoinChannel;
         class LeaveChannel;
-        class UserlistAdd;
-        class UserlistRemove;
-        class UserlistUpdate;
     }
 
     namespace Chat