Core/Misc: Moved CharacterInfo out of world to separate class
Port From (https://github.com/TrinityCore/TrinityCore/commit/ad4e63bae145ae49b584ab2fc621660430cec0d3)
This commit is contained in:
@@ -60,7 +60,7 @@ namespace Game
|
||||
ulong guildID = 0;
|
||||
|
||||
if (flags.HasAnyFlag(CalendarFlags.GuildEvent) || flags.HasAnyFlag(CalendarFlags.WithoutInvites))
|
||||
guildID = Player.GetGuildIdFromDB(ownerGUID);
|
||||
guildID = Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(ownerGUID);
|
||||
|
||||
CalendarEvent calendarEvent = new CalendarEvent(eventID, ownerGUID, guildID, type, textureID, date, flags, title, description, lockDate);
|
||||
_events.Add(calendarEvent);
|
||||
@@ -397,7 +397,7 @@ namespace Game
|
||||
ObjectGuid invitee = invite.InviteeGuid;
|
||||
Player player = Global.ObjAccessor.FindPlayer(invitee);
|
||||
|
||||
uint level = player ? player.getLevel() : Player.GetLevelFromDB(invitee);
|
||||
uint level = player ? player.getLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(invitee);
|
||||
|
||||
SCalendarEventInvite packet = new SCalendarEventInvite();
|
||||
packet.EventID = calendarEvent != null ? calendarEvent.EventId : 0;
|
||||
@@ -545,8 +545,8 @@ namespace Game
|
||||
ObjectGuid inviteeGuid = calendarInvite.InviteeGuid;
|
||||
Player invitee = Global.ObjAccessor.FindPlayer(inviteeGuid);
|
||||
|
||||
uint inviteeLevel = invitee ? invitee.getLevel() : Player.GetLevelFromDB(inviteeGuid);
|
||||
ulong inviteeGuildId = invitee ? invitee.GetGuildId() : Player.GetGuildIdFromDB(inviteeGuid);
|
||||
uint inviteeLevel = invitee ? invitee.getLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(inviteeGuid);
|
||||
ulong inviteeGuildId = invitee ? invitee.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(inviteeGuid);
|
||||
|
||||
CalendarEventInviteInfo inviteInfo = new CalendarEventInviteInfo();
|
||||
inviteInfo.Guid = inviteeGuid;
|
||||
|
||||
Reference in New Issue
Block a user