Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/PacketIO: Updated packet structures to 9.2.5

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d3c4216de8e1dcb9f62d2fcc1b9b72852e5409c9)
This commit is contained in:
hondacrx
2022-06-03 20:01:55 -04:00
parent 598cdb6947
commit 4efe624af1
24 changed files with 957 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Network/Opcodes.cs
+685 -677
View File
File diff suppressed because it is too large Load Diff
Source/Framework/Constants/SupportSystemConst.cs
+45 -10
View File
@@ -17,22 +17,57 @@
namespace Framework.Constants
{
public enum ReportType
{
Chat = 0,
InWorld = 1,
ClubFinderPosting = 2,
ClubFinderApplicant = 3,
GroupFinderPosting = 4,
GroupFinderApplicant = 5,
ClubMember = 6,
GroupMember = 7,
Friend = 8,
Pet = 9,
BattlePet = 10,
Calendar = 11,
Mail = 12,
PvP = 13,
}
public enum ReportMajorCategory
{
InappropriateCommunication = 0,
GameplaySabotage = 1,
Cheating = 2,
InappropriateName = 3,
}
public enum ReportMinorCategory
{
TextChat = 0x0001,
Boosting = 0x0002,
Spam = 0x0004,
Afk = 0x0008,
IntentionallyFeeding = 0x0010,
BlockingProgress = 0x0020,
Hacking = 0x0040,
Botting = 0x0080,
Advertisement = 0x0100,
BTag = 0x0200,
GroupName = 0x0400,
CharacterName = 0x0800,
GuildName = 0x1000,
Description = 0x2000,
Name = 0x4000,
}
public enum GMTicketSystemStatus
{
Disabled = 0,
Enabled = 1
}
public enum GMSupportComplaintType
{
None = 0,
Language = 2,
PlayerName = 4,
Cheat = 15,
GuildName = 23,
Spamming = 24
}
public enum SupportSpamType
{
Mail = 0,
Source/Framework/Database/Databases/CharacterDatabase.cs
+3 -3
View File
@@ -304,7 +304,7 @@ namespace Framework.Database
PrepareStatement(CharStatements.INS_GUILD_MEMBER_WITHDRAW_MONEY, "INSERT INTO guild_member_withdraw (guid, money) VALUES (?, ?) ON DUPLICATE KEY UPDATE money = VALUES (money)");
PrepareStatement(CharStatements.DEL_GUILD_MEMBER_WITHDRAW, "TRUNCATE guild_member_withdraw");
PrepareStatement(CharStatements.SEL_CHAR_DATA_FOR_GUILD, "SELECT name, level, class, gender, zone, account FROM characters WHERE guid = ?");
PrepareStatement(CharStatements.SEL_CHAR_DATA_FOR_GUILD, "SELECT name, level, race, class, gender, zone, account FROM characters WHERE guid = ?");
PrepareStatement(CharStatements.DEL_GUILD_ACHIEVEMENT, "DELETE FROM guild_achievement WHERE guildId = ? AND achievement = ?");
PrepareStatement(CharStatements.INS_GUILD_ACHIEVEMENT, "INSERT INTO guild_achievement (guildId, achievement, date, guids) VALUES (?, ?, ?, ?)");
PrepareStatement(CharStatements.DEL_GUILD_ACHIEVEMENT_CRITERIA, "DELETE FROM guild_achievement_progress WHERE guildId = ? AND criteria = ?");
@@ -439,8 +439,8 @@ namespace Framework.Database
PrepareStatement(CharStatements.DEL_ALL_GM_BUGS, "TRUNCATE TABLE gm_bug");
// GM Complaint
PrepareStatement(CharStatements.SEL_GM_COMPLAINTS, "SELECT id, playerGuid, note, createTime, mapId, posX, posY, posZ, facing, targetCharacterGuid, complaintType, reportLineIndex, assignedTo, closedBy, comment FROM gm_complaint");
PrepareStatement(CharStatements.REP_GM_COMPLAINT, "REPLACE INTO gm_complaint (id, playerGuid, note, createTime, mapId, posX, posY, posZ, facing, targetCharacterGuid, complaintType, reportLineIndex, assignedTo, closedBy, comment) VALUES (?, ?, ?, UNIX_TIMESTAMP(NOW()), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
PrepareStatement(CharStatements.SEL_GM_COMPLAINTS, "SELECT id, playerGuid, note, createTime, mapId, posX, posY, posZ, facing, targetCharacterGuid, reportType, reportMajorCategory, reportMinorCategoryFlags, reportLineIndex, assignedTo, closedBy, comment FROM gm_complaint");
PrepareStatement(CharStatements.REP_GM_COMPLAINT, "REPLACE INTO gm_complaint (id, playerGuid, note, createTime, mapId, posX, posY, posZ, facing, targetCharacterGuid, reportType, reportMajorCategory, reportMinorCategoryFlags, reportLineIndex, assignedTo, closedBy, comment) VALUES (?, ?, ?, UNIX_TIMESTAMP(NOW()), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
PrepareStatement(CharStatements.DEL_GM_COMPLAINT, "DELETE FROM gm_complaint WHERE id = ?");
PrepareStatement(CharStatements.SEL_GM_COMPLAINT_CHATLINES, "SELECT timestamp, text FROM gm_complaint_chatlog WHERE complaintId = ? ORDER BY lineId ASC");
PrepareStatement(CharStatements.INS_GM_COMPLAINT_CHATLINE, "INSERT INTO gm_complaint_chatlog (complaintId, lineId, timestamp, text) VALUES (?, ?, ?, ?)");
Source/Game/Entities/Object/Update/UpdateFields.cs
+3 -3
View File
@@ -3569,7 +3569,7 @@ namespace Game.Entities
public UpdateFieldArray<float> WeaponDmgMultipliers = new(3, 585, 586);
public UpdateFieldArray<float> WeaponAtkSpeedMultipliers = new(3, 585, 589);
public UpdateFieldArray<uint> BuybackPrice = new(12, 592, 593);
public UpdateFieldArray<uint> BuybackTimestamp = new(12, 592, 605);
public UpdateFieldArray<long> BuybackTimestamp = new(12, 592, 605);
public UpdateFieldArray<uint> CombatRatings = new(32, 617, 618);
public UpdateFieldArray<PVPInfo> PvpInfo = new(6, 650, 651);
public UpdateFieldArray<uint> NoReagentCostMask = new(4, 657, 658);
@@ -3658,7 +3658,7 @@ namespace Game.Entities
for (int i = 0; i < 12; ++i)
{
data.WriteUInt32(BuybackPrice[i]);
data.WriteUInt32(BuybackTimestamp[i]);
data.WriteInt64(BuybackTimestamp[i]);
}
data.WriteUInt16(TodayHonorableKills);
data.WriteUInt16(YesterdayHonorableKills);
@@ -4697,7 +4697,7 @@ namespace Game.Entities
}
if (changesMask[605 + i])
{
data.WriteUInt32(BuybackTimestamp[i]);
data.WriteInt64(BuybackTimestamp[i]);
}
}
}
Source/Game/Entities/Object/WorldObject.cs
+1 -3
View File
@@ -3806,10 +3806,8 @@ namespace Game.Entities
Direction = data.ReadVector3();
TransportID = data.ReadUInt32();
Magnitude = data.ReadFloat();
Unused910 = data.ReadInt32();
Type = (MovementForceType)data.ReadBits<byte>(2);
bool has910 = data.HasBit();
if (has910)
Unused910 = data.ReadInt32();
}
public void Write(WorldPacket data)
Source/Game/Entities/Player/Player.Items.cs
+3 -4
View File
@@ -3025,7 +3025,7 @@ namespace Game.Entities
// if current back slot non-empty search oldest or free
if (m_items[slot] != null)
{
uint oldest_time = m_activePlayerData.BuybackTimestamp[0];
long oldest_time = m_activePlayerData.BuybackTimestamp[0];
uint oldest_slot = InventorySlots.BuyBackStart;
for (byte i = InventorySlots.BuyBackStart + 1; i < InventorySlots.BuyBackEnd; ++i)
@@ -3037,8 +3037,7 @@ namespace Game.Entities
break;
}
uint i_time = m_activePlayerData.BuybackTimestamp[i - InventorySlots.BuyBackStart];
long i_time = m_activePlayerData.BuybackTimestamp[i - InventorySlots.BuyBackStart];
if (oldest_time > i_time)
{
oldest_time = i_time;
@@ -3489,7 +3488,7 @@ namespace Game.Entities
DB.Characters.CommitTransaction(trans);
}
public void SetBuybackPrice(uint slot, uint price) { SetUpdateFieldValue(ref m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.BuybackPrice, (int)slot), price); }
public void SetBuybackTimestamp(uint slot, uint timestamp) { SetUpdateFieldValue(ref m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.BuybackTimestamp, (int)slot), timestamp); }
public void SetBuybackTimestamp(uint slot, long timestamp) { SetUpdateFieldValue(ref m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.BuybackTimestamp, (int)slot), timestamp); }
public Item GetItemFromBuyBackSlot(uint slot)
{
Source/Game/Groups/Group.cs
+6
View File
@@ -399,6 +399,7 @@ namespace Game.Groups
MemberSlot member = new();
member.guid = player.GetGUID();
member.name = player.GetName();
member.race = player.GetRace();
member._class = (byte)player.GetClass();
member.group = subGroup;
member.flags = 0;
@@ -1469,6 +1470,10 @@ namespace Game.Groups
playerInfos.Name = member.name;
playerInfos.Class = member._class;
ChrRacesRecord race = CliDB.ChrRacesStorage.LookupByKey((uint)member.race);
FactionTemplateRecord raceFaction = CliDB.FactionTemplateStorage.LookupByKey(race.FactionID);
playerInfos.FactionGroup = raceFaction.FactionGroup;
playerInfos.Status = GroupMemberOnlineStatus.Offline;
if (memberPlayer && memberPlayer.GetSession() && !memberPlayer.GetSession().PlayerLogout())
playerInfos.Status = GroupMemberOnlineStatus.Online | (IsBGGroup() || IsBFGroup() ? GroupMemberOnlineStatus.PVP : 0);
@@ -2845,6 +2850,7 @@ namespace Game.Groups
{
public ObjectGuid guid;
public string name;
public Race race;
public byte _class;
public byte group;
public GroupMemberFlags flags;
Source/Game/Guilds/Guild.cs
+26 -13
View File
@@ -236,6 +236,7 @@ namespace Game.Guilds
memberData.Level = member.GetLevel();
memberData.ClassID = (byte)member.GetClass();
memberData.Gender = (byte)member.GetGender();
memberData.RaceID = (byte)member.GetRace();
memberData.Authenticated = false;
memberData.SorEligible = false;
@@ -1650,10 +1651,11 @@ namespace Game.Guilds
member.SetStats(
name,
result.Read<byte>(1),
(Class)result.Read<byte>(2),
(Gender)result.Read<byte>(3),
result.Read<ushort>(4),
result.Read<uint>(5),
(Race)result.Read<byte>(2),
(Class)result.Read<byte>(3),
(Gender)result.Read<byte>(4),
result.Read<ushort>(5),
result.Read<uint>(6),
0);
ok = member.CheckStats();
@@ -2603,6 +2605,7 @@ namespace Game.Guilds
{
m_name = player.GetName();
m_level = (byte)player.GetLevel();
m_race = player.GetRace();
m_class = player.GetClass();
_gender = player.GetNativeGender();
m_zoneId = player.GetZoneId();
@@ -2610,10 +2613,11 @@ namespace Game.Guilds
m_achievementPoints = player.GetAchievementPoints();
}
public void SetStats(string name, byte level, Class _class, Gender gender, uint zoneId, uint accountId, uint reputation)
public void SetStats(string name, byte level, Race race, Class _class, Gender gender, uint zoneId, uint accountId, uint reputation)
{
m_name = name;
m_level = level;
m_race = race;
m_class = _class;
_gender = gender;
m_zoneId = zoneId;
@@ -2685,12 +2689,13 @@ namespace Game.Guilds
SetStats(field.Read<string>(14),
field.Read<byte>(15), // characters.level
(Class)field.Read<byte>(16), // characters.class
(Gender)field.Read<byte>(17), // characters.gender
field.Read<ushort>(18), // characters.zone
field.Read<uint>(19), // characters.account
(Race)field.Read<byte>(16), // characters.race
(Class)field.Read<byte>(17), // characters.class
(Gender)field.Read<byte>(18), // characters.gender
field.Read<ushort>(19), // characters.zone
field.Read<uint>(20), // characters.account
0);
m_logoutTime = field.Read<ulong>(20); // characters.logout_time
m_logoutTime = field.Read<ulong>(21); // characters.logout_time
m_totalActivity = 0;
m_weekActivity = 0;
m_weekReputation = 0;
@@ -2711,13 +2716,19 @@ namespace Game.Guilds
{
if (m_level < 1)
{
Log.outError(LogFilter.Guild, "Player ({0}) has a broken data in field `characters`.`level`, deleting him from guild!", m_guid.ToString());
Log.outError(LogFilter.Guild, $"{m_guid} has a broken data in field `characters`.`level`, deleting him from guild!");
return false;
}
if (m_class < Class.Warrior || m_class >= Class.Max)
if (!CliDB.ChrRacesStorage.ContainsKey((uint)m_race))
{
Log.outError(LogFilter.Guild, "Player ({0}) has a broken data in field `characters`.`class`, deleting him from guild!", m_guid.ToString());
Log.outError(LogFilter.Guild, $"{m_guid} has a broken data in field `characters`.`race`, deleting him from guild!");
return false;
}
if (!CliDB.ChrClassesStorage.ContainsKey((uint)m_class))
{
Log.outError(LogFilter.Guild, $"{m_guid} has a broken data in field `characters`.`class`, deleting him from guild!");
return false;
}
return true;
@@ -2790,6 +2801,7 @@ namespace Game.Guilds
public ulong GetLogoutTime() { return m_logoutTime; }
public string GetPublicNote() { return m_publicNote; }
public string GetOfficerNote() { return m_officerNote; }
public Race GetRace() { return m_race; }
public Class GetClass() { return m_class; }
public Gender GetGender() { return _gender; }
public byte GetLevel() { return m_level; }
@@ -2822,6 +2834,7 @@ namespace Game.Guilds
string m_name;
uint m_zoneId;
byte m_level;
Race m_race;
Class m_class;
Gender _gender;
GuildMemberFlags m_flags;
Source/Game/Guilds/GuildManager.cs
+2 -2
View File
@@ -177,8 +177,8 @@ namespace Game
// 0 1 2 3 4 5 6 7 8 9 10
SQLResult result = DB.Characters.Query("SELECT gm.guildid, gm.guid, rank, pnote, offnote, w.tab0, w.tab1, w.tab2, w.tab3, w.tab4, w.tab5, " +
// 11 12 13 14 15 16 17 18 19 20
"w.tab6, w.tab7, w.money, c.name, c.level, c.class, c.gender, c.zone, c.account, c.logout_time " +
// 11 12 13 14 15 16 17 18 19 20 21
"w.tab6, w.tab7, w.money, c.name, c.level, c.race, c.class, c.gender, c.zone, c.account, c.logout_time " +
"FROM guild_member gm LEFT JOIN guild_member_withdraw w ON gm.guid = w.guid " +
"LEFT JOIN characters c ON c.guid = gm.guid ORDER BY gm.guildid ASC");
Source/Game/Handlers/AuctionHandler.cs
+27
View File
@@ -541,6 +541,33 @@ namespace Game
SendPacket(response);
}
[WorldPacketHandler(ClientOpcodes.AuctionRequestFavoriteList)]
void HandleAuctionRequestFavoriteList(AuctionRequestFavoriteList requestFavoriteList)
{
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHARACTER_FAVORITE_AUCTIONS);
stmt.AddValue(0, _player.GetGUID().GetCounter());
GetQueryProcessor().AddCallback(DB.Characters.AsyncQuery(stmt)).WithCallback(favoriteAuctionResult =>
{
AuctionFavoriteList favoriteItems = new();
if (!favoriteAuctionResult.IsEmpty())
{
do
{
AuctionFavoriteInfo item = new();
item.Order = favoriteAuctionResult.Read<uint>(0);
item.ItemID = favoriteAuctionResult.Read<uint>(1);
item.ItemLevel = favoriteAuctionResult.Read<uint>(2);
item.BattlePetSpeciesID = favoriteAuctionResult.Read<uint>(3);
item.SuffixItemNameDescriptionID = favoriteAuctionResult.Read<uint>(4);
favoriteItems.Items.Add(item);
} while (favoriteAuctionResult.NextRow());
}
SendPacket(favoriteItems);
});
}
[WorldPacketHandler(ClientOpcodes.AuctionSellCommodity)]
void HandleAuctionSellCommodity(AuctionSellCommodity sellCommodity)
{
Source/Game/Handlers/CharacterHandler.cs
-23
View File
@@ -880,29 +880,6 @@ namespace Game
// Place character in world (and load zone) before some object loading
pCurrChar.LoadCorpse(holder.GetResult(PlayerLoginQueryLoad.CorpseLocation));
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHARACTER_FAVORITE_AUCTIONS);
stmt.AddValue(0, pCurrChar.GetGUID().GetCounter());
GetQueryProcessor().AddCallback(DB.Characters.AsyncQuery(stmt)).WithCallback(favoriteAuctionResult =>
{
AuctionFavoriteList favoriteItems = new();
if (!favoriteAuctionResult.IsEmpty())
{
do
{
AuctionFavoriteInfo item = new();
item.Order = favoriteAuctionResult.Read<uint>(0);
item.ItemID = favoriteAuctionResult.Read<uint>(1);
item.ItemLevel = favoriteAuctionResult.Read<uint>(2);
item.BattlePetSpeciesID = favoriteAuctionResult.Read<uint>(3);
item.SuffixItemNameDescriptionID = favoriteAuctionResult.Read<uint>(4);
favoriteItems.Items.Add(item);
} while (favoriteAuctionResult.NextRow());
}
SendPacket(favoriteItems);
});
// setting Ghost+speed if dead
if (pCurrChar.GetDeathState() == DeathState.Dead)
{
Source/Game/Handlers/SocialHandler.cs
+8
View File
@@ -364,5 +364,13 @@ namespace Game
Log.outDebug(LogFilter.Network, "WorldSession.HandleSetContactNotesOpcode: Contact: {0}, Notes: {1}", packet.Player.Guid.ToString(), packet.Notes);
GetPlayer().GetSocial().SetFriendNote(packet.Player.Guid, packet.Notes);
}
[WorldPacketHandler(ClientOpcodes.SocialContractRequest)]
void HandleSocialContractRequest(SocialContractRequest socialContractRequest)
{
SocialContractRequestResponse response = new();
response.ShowSocialContract = false;
SendPacket(response);
}
}
}
Source/Game/Handlers/TicketHandler.cs
+3 -1
View File
@@ -83,7 +83,9 @@ namespace Game
comp.SetFacing(packet.Header.Facing);
comp.SetChatLog(packet.ChatLog);
comp.SetTargetCharacterGuid(packet.TargetCharacterGUID);
comp.SetComplaintType((GMSupportComplaintType)packet.ComplaintType);
comp.SetReportType((ReportType)packet.ReportType);
comp.SetMajorCategory((ReportMajorCategory)packet.MajorCategory);
comp.SetMinorCategoryFlags((ReportMinorCategory)packet.MinorCategoryFlags);
comp.SetNote(packet.Note);
Global.SupportMgr.AddTicket(comp);
Source/Game/Networking/Packets/AuctionHousePackets.cs
+7
View File
@@ -347,6 +347,13 @@ namespace Game.Networking.Packets
}
}
class AuctionRequestFavoriteList : ClientPacket
{
public AuctionRequestFavoriteList(WorldPacket packet) : base(packet) { }
public override void Read() { }
}
class AuctionSellCommodity : ClientPacket
{
public ObjectGuid Auctioneer;
Source/Game/Networking/Packets/GarrisonPackets.cs
+66 -24
View File
@@ -400,34 +400,29 @@ namespace Game.Networking.Packets
public string CustomName = "";
}
class GarrisonMission
class GarrisonEncounter
{
public int GarrEncounterID;
public List<int> Mechanics = new();
public int GarrAutoCombatantID;
public int Health;
public int MaxHealth;
public int Attack;
public sbyte BoardIndex;
public void Write(WorldPacket data)
{
data.WriteUInt64(DbID);
data.WriteInt64(OfferTime);
data.WriteUInt32(OfferDuration);
data.WriteInt64(StartTime);
data.WriteUInt32(TravelDuration);
data.WriteUInt32(MissionDuration);
data.WriteUInt32(MissionRecID);
data.WriteUInt32(MissionState);
data.WriteUInt32(SuccessChance);
data.WriteUInt32(Flags);
data.WriteFloat(MissionScalar);
}
data.WriteInt32(GarrEncounterID);
data.WriteInt32(Mechanics.Count);
data.WriteInt32(GarrAutoCombatantID);
data.WriteInt32(Health);
data.WriteInt32(MaxHealth);
data.WriteInt32(Attack);
data.WriteInt8(BoardIndex);
public ulong DbID;
public uint MissionRecID;
public long OfferTime;
public uint OfferDuration;
public long StartTime = 2288912640;
public uint TravelDuration;
public uint MissionDuration;
public uint MissionState;
public uint SuccessChance;
public uint Flags;
public float MissionScalar = 1.0f;
if (!Mechanics.Empty())
Mechanics.ForEach(id => data.WriteInt32(id));
}
}
struct GarrisonMissionReward
@@ -458,6 +453,53 @@ namespace Game.Networking.Packets
public ItemInstance ItemInstance;
}
class GarrisonMission
{
public ulong DbID;
public int MissionRecID;
public long OfferTime;
public uint OfferDuration;
public long StartTime = 2288912640;
public uint TravelDuration;
public uint MissionDuration;
public int MissionState = 0;
public int SuccessChance = 0;
public uint Flags = 0;
public float MissionScalar = 1.0f;
public int ContentTuningID = 0;
public List<GarrisonEncounter> Encounters = new();
public List<GarrisonMissionReward> Rewards = new();
public List<GarrisonMissionReward> OvermaxRewards = new();
public void Write(WorldPacket data)
{
data.WriteUInt64(DbID);
data.WriteInt32(MissionRecID);
data.WriteInt64(OfferTime);
data.WriteUInt32(OfferDuration);
data.WriteInt64(StartTime);
data.WriteUInt32(TravelDuration);
data.WriteUInt32(MissionDuration);
data.WriteInt32(MissionState);
data.WriteInt32(SuccessChance);
data.WriteUInt32(Flags);
data.WriteFloat(MissionScalar);
data.WriteInt32(ContentTuningID);
data.WriteInt32(Encounters.Count);
data.WriteInt32(Rewards.Count);
data.WriteInt32(OvermaxRewards.Count);
foreach (GarrisonEncounter encounter in Encounters)
encounter.Write(data);
foreach (GarrisonMissionReward missionRewardItem in Rewards)
missionRewardItem.Write(data);
foreach (GarrisonMissionReward missionRewardItem in OvermaxRewards)
missionRewardItem.Write(data);
}
}
struct GarrisonMissionBonusAbility
{
public void Write(WorldPacket data)
Source/Game/Networking/Packets/GuildPackets.cs
+4
View File
@@ -1638,6 +1638,8 @@ namespace Game.Networking.Packets
data.WriteUInt8(Level);
data.WriteUInt8(ClassID);
data.WriteUInt8(Gender);
data.WriteUInt64(GuildClubMemberID);
data.WriteUInt8(RaceID);
data.WriteBits(Name.GetByteCount(), 6);
data.WriteBits(Note.GetByteCount(), 8);
@@ -1670,6 +1672,8 @@ namespace Game.Networking.Packets
public byte Level;
public byte ClassID;
public byte Gender;
public ulong GuildClubMemberID;
public byte RaceID;
public bool Authenticated;
public bool SorEligible;
public GuildRosterProfessionData[] Profession = new GuildRosterProfessionData[2];
Source/Game/Networking/Packets/LFGPackets.cs
+5
View File
@@ -762,6 +762,8 @@ namespace Game.Networking.Packets
Id = data.ReadUInt32();
Type = (RideType)data.ReadUInt32();
Time = data.ReadInt64();
Unknown925 = data.HasBit();
data.ResetBitPos();
}
public void Write(WorldPacket data)
@@ -770,12 +772,15 @@ namespace Game.Networking.Packets
data.WriteUInt32(Id);
data.WriteUInt32((uint)Type);
data.WriteInt64(Time);
data.WriteBit(Unknown925);
data.FlushBits();
}
public ObjectGuid RequesterGuid;
public uint Id;
public RideType Type;
public long Time;
public bool Unknown925;
}
public enum RideType
Source/Game/Networking/Packets/MovementPackets.cs
+1 -4
View File
@@ -342,12 +342,9 @@ namespace Game.Networking.Packets
data.WriteUInt32(movementForce.TransportID);
data.WriteFloat(movementForce.Magnitude);
data.WriteInt32(movementForce.Unused910);
data.WriteBits((byte)movementForce.Type, 2);
data.WriteBit(movementForce.Unused910 != 0);
data.FlushBits();
if (movementForce.Unused910 != 0)
data.WriteInt32(movementForce.Unused910);
}
}
Source/Game/Networking/Packets/PartyPackets.cs
+2
View File
@@ -1084,6 +1084,7 @@ namespace Game.Networking.Packets
data.WriteUInt8(Flags);
data.WriteUInt8(RolesAssigned);
data.WriteUInt8(Class);
data.WriteUInt8(FactionGroup);
data.WriteString(Name);
if (!VoiceStateID.IsEmpty())
data.WriteString(VoiceStateID);
@@ -1097,6 +1098,7 @@ namespace Game.Networking.Packets
public byte Subgroup;
public byte Flags;
public byte RolesAssigned;
public byte FactionGroup;
public bool FromSocialQueue;
public bool VoiceChatSilenced;
}
Source/Game/Networking/Packets/SocialPackets.cs
+20
View File
@@ -169,6 +169,26 @@ namespace Game.Networking.Packets
public QualifiedGUID Player;
}
class SocialContractRequest : ClientPacket
{
public SocialContractRequest(WorldPacket packet) : base(packet) { }
public override void Read() { }
}
class SocialContractRequestResponse : ServerPacket
{
public bool ShowSocialContract;
public SocialContractRequestResponse() : base(ServerOpcodes.SocialContractRequestResponse) { }
public override void Write()
{
_worldPacket.WriteBit(ShowSocialContract);
_worldPacket.FlushBits();
}
}
//Structs
public class ContactInfo
{
Source/Game/Networking/Packets/TicketPackets.cs
+8 -2
View File
@@ -129,8 +129,10 @@ namespace Game.Networking.Packets
{
Header.Read(_worldPacket);
TargetCharacterGUID = _worldPacket.ReadPackedGuid();
ReportType = _worldPacket.ReadInt32();
MajorCategory = _worldPacket.ReadInt32();
MinorCategoryFlags = _worldPacket.ReadInt32();
ChatLog.Read(_worldPacket);
ComplaintType = _worldPacket.ReadBits<byte>(5);
uint noteLength = _worldPacket.ReadBits<uint>(10);
bool hasMailInfo = _worldPacket.HasBit();
@@ -209,7 +211,9 @@ namespace Game.Networking.Packets
public SupportTicketHeader Header;
public SupportTicketChatLog ChatLog;
public ObjectGuid TargetCharacterGUID;
public byte ComplaintType;
public int ReportType;
public int MajorCategory;
public int MinorCategoryFlags;
public string Note;
public SupportTicketHorusChatLog HorusChatLog;
public SupportTicketMailInfo? MailInfo;
@@ -578,10 +582,12 @@ namespace Game.Networking.Packets
MapID = packet.ReadUInt32();
Position = packet.ReadVector3();
Facing = packet.ReadFloat();
Program = packet.ReadInt32();
}
public uint MapID;
public Vector3 Position;
public float Facing;
public int Program;
}
}
Source/Game/SupportSystem/SupportTickets.cs
+15 -5
View File
@@ -213,7 +213,9 @@ namespace Game.SupportSystem
{
float _facing;
ObjectGuid _targetCharacterGuid;
GMSupportComplaintType _complaintType;
ReportType _reportType;
ReportMajorCategory _majorCategory;
ReportMinorCategory _minorCategoryFlags = ReportMinorCategory.TextChat;
SupportTicketSubmitComplaint.SupportTicketChatLog _chatLog;
string _note;
@@ -239,7 +241,9 @@ namespace Game.SupportSystem
_pos = new Vector3(fields.Read<float>(++idx), fields.Read<float>(++idx), fields.Read<float>(++idx));
_facing = fields.Read<float>(++idx);
_targetCharacterGuid = ObjectGuid.Create(HighGuid.Player, fields.Read<ulong>(++idx));
_complaintType = (GMSupportComplaintType)fields.Read<byte>(++idx);
_reportType = (ReportType)fields.Read<int>(++idx);
_majorCategory = (ReportMajorCategory)fields.Read<int>(++idx);
_minorCategoryFlags = (ReportMinorCategory)fields.Read<int>(++idx);
int reportLineIndex = fields.Read<int>(++idx);
if (reportLineIndex != -1)
_chatLog.ReportLineIndex = (uint)reportLineIndex;
@@ -282,7 +286,9 @@ namespace Game.SupportSystem
stmt.AddValue(++idx, _pos.Z);
stmt.AddValue(++idx, _facing);
stmt.AddValue(++idx, _targetCharacterGuid.GetCounter());
stmt.AddValue(++idx, (byte)_complaintType);
stmt.AddValue(++idx, (int)_reportType);
stmt.AddValue(++idx, (int)_majorCategory);
stmt.AddValue(++idx, (int)_minorCategoryFlags);
if (_chatLog.ReportLineIndex.HasValue)
stmt.AddValue(++idx, _chatLog.ReportLineIndex.Value);
else
@@ -342,7 +348,9 @@ namespace Game.SupportSystem
}
ObjectGuid GetTargetCharacterGuid() { return _targetCharacterGuid; }
GMSupportComplaintType GetComplaintType() { return _complaintType; }
ReportType GetReportType() { return _reportType; }
ReportMajorCategory GetMajorCategory() { return _majorCategory; }
ReportMinorCategory GetMinorCategoryFlags() { return _minorCategoryFlags; }
string GetNote() { return _note; }
public void SetFacing(float facing) { _facing = facing; }
@@ -350,7 +358,9 @@ namespace Game.SupportSystem
{
_targetCharacterGuid = targetCharacterGuid;
}
public void SetComplaintType(GMSupportComplaintType type) { _complaintType = type; }
public void SetReportType(ReportType reportType) { _reportType = reportType; }
public void SetMajorCategory(ReportMajorCategory majorCategory) { _majorCategory = majorCategory; }
public void SetMinorCategoryFlags(ReportMinorCategory minorCategoryFlags) { _minorCategoryFlags = minorCategoryFlags; }
public void SetChatLog(SupportTicketSubmitComplaint.SupportTicketChatLog log) { _chatLog = log; }
public void SetNote(string note) { _note = note; }
}
sql/base/characters_database.sql
+5 -2
View File
@@ -2063,7 +2063,9 @@ CREATE TABLE `gm_complaint` (
`posZ` float NOT NULL DEFAULT '0',
`facing` float NOT NULL DEFAULT '0',
`targetCharacterGuid` bigint unsigned NOT NULL,
`complaintType` smallint unsigned NOT NULL,
`reportType` int NOT NULL DEFAULT '0',
`reportMajorCategory` int NOT NULL DEFAULT '0',
`reportMinorCategoryFlags` int NOT NULL DEFAULT '0',
`reportLineIndex` int NOT NULL,
`closedBy` bigint NOT NULL DEFAULT '0',
`assignedTo` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
@@ -3667,7 +3669,8 @@ INSERT INTO `updates` VALUES
('2022_01_31_02_characters.sql','6E3A3F02276287DD540BC4C17E246DFB850260D8','ARCHIVED','2022-01-31 21:43:38',0),
('2022_02_28_00_characters_2020_09_27_00_characters.sql','2292A1ED0E7F46DEC41384F75FA6D9461464EEB8','ARCHIVED','2022-02-28 12:43:58',0),
('2022_03_06_00_characters.sql','474AAF9D03E6A56017899C968DC9875368301934','ARCHIVED','2022-03-06 15:12:24',0),
('2022_03_11_00_characters_2021_07_18_00_characters.sql','0BA579ED21F4E75AC2B4797421B5029568B3F6E2','RELEASED','2022-03-11 18:56:07',0);
('2022_03_11_00_characters_2021_07_18_00_characters.sql','0BA579ED21F4E75AC2B4797421B5029568B3F6E2','RELEASED','2022-03-11 18:56:07',0),
('2022_06_01_00_characters.sql','582AC6E256F8365F83AB70BA165CCC8B218E19FF','RELEASED','2022-06-01 21:16:56',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
sql/updates/characters/master/2022_06_01_00_characters.sql
+12
View File
@@ -0,0 +1,12 @@
ALTER TABLE `gm_complaint`
ADD `reportType` int NOT NULL DEFAULT '0' AFTER `complaintType`,
ADD `reportMajorCategory` int NOT NULL DEFAULT '0' AFTER `reportType`,
ADD `reportMinorCategoryFlags` int NOT NULL DEFAULT '0' AFTER `reportMajorCategory`;
UPDATE `gm_complaint` SET `reportType`=0,`reportMajorCategory`=0,`reportMinorCategoryFlags`=0x1 WHERE `complaintType`=2;
UPDATE `gm_complaint` SET `reportType`=1,`reportMajorCategory`=3,`reportMinorCategoryFlags`=0x800 WHERE `complaintType`=4;
UPDATE `gm_complaint` SET `reportType`=1,`reportMajorCategory`=2,`reportMinorCategoryFlags`=0x40 WHERE `complaintType`=15;
UPDATE `gm_complaint` SET `reportType`=1,`reportMajorCategory`=3,`reportMinorCategoryFlags`=0x1000 WHERE `complaintType`=23;
UPDATE `gm_complaint` SET `reportType`=0,`reportMajorCategory`=0,`reportMinorCategoryFlags`=0x4 WHERE `complaintType`=24;
ALTER TABLE `gm_complaint` DROP `complaintType`;