From f6cf613d4a3b246dc35a2b212caff156b2883744 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 2 Oct 2021 21:03:32 -0400 Subject: [PATCH] Core/Players: Do not show zone on character list before first login Port From (https://github.com/TrinityCore/TrinityCore/commit/2bf8110032e84796f21d4d44d72e33abc58a4e1e) --- Source/Framework/Database/Databases/CharacterDatabase.cs | 4 ++-- Source/Game/Entities/Player/Player.DB.cs | 1 - sql/updates/characters/master/2021_10_02_01_characters.sql | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 sql/updates/characters/master/2021_10_02_01_characters.sql diff --git a/Source/Framework/Database/Databases/CharacterDatabase.cs b/Source/Framework/Database/Databases/CharacterDatabase.cs index fb9cde527..b53556b62 100644 --- a/Source/Framework/Database/Databases/CharacterDatabase.cs +++ b/Source/Framework/Database/Databases/CharacterDatabase.cs @@ -473,9 +473,9 @@ namespace Framework.Database PrepareStatement(CharStatements.INS_CHARACTER, "INSERT INTO characters (guid, account, name, race, class, gender, level, xp, money, inventorySlots, bankSlots, restState, playerFlags, playerFlagsEx, " + "map, instance_id, dungeonDifficulty, raidDifficulty, legacyRaidDifficulty, position_x, position_y, position_z, orientation, trans_x, trans_y, trans_z, trans_o, transguid, " + "taximask, createTime, createMode, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, primarySpecialization, " + - "extra_flags, stable_slots, at_login, zone, death_expire_time, taxi_path, totalKills, todayKills, yesterdayKills, chosenTitle, watchedFaction, drunk, health, power1, power2, power3, " + + "extra_flags, stable_slots, at_login, death_expire_time, taxi_path, totalKills, todayKills, yesterdayKills, chosenTitle, watchedFaction, drunk, health, power1, power2, power3, " + "power4, power5, power6, latency, activeTalentGroup, lootSpecId, exploredZones, equipmentCache, knownTitles, actionBars, lastLoginBuild) VALUES " + - "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); PrepareStatement(CharStatements.UPD_CHARACTER, "UPDATE characters SET name=?,race=?,class=?,gender=?,level=?,xp=?,money=?,inventorySlots=?,bankSlots=?,restState=?,playerFlags=?,playerFlagsEx=?," + "map=?,instance_id=?,dungeonDifficulty=?,raidDifficulty=?,legacyRaidDifficulty=?,position_x=?,position_y=?,position_z=?,orientation=?,trans_x=?,trans_y=?,trans_z=?,trans_o=?,transguid=?,taximask=?,cinematic=?,totaltime=?,leveltime=?,rest_bonus=?," + "logout_time=?,is_logout_resting=?,resettalents_cost=?,resettalents_time=?,numRespecs=?,primarySpecialization=?,extra_flags=?,stable_slots=?,at_login=?,zone=?,death_expire_time=?,taxi_path=?," + diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs index 92d514d1f..37fc71b9f 100644 --- a/Source/Game/Entities/Player/Player.DB.cs +++ b/Source/Game/Entities/Player/Player.DB.cs @@ -3425,7 +3425,6 @@ namespace Game.Entities stmt.AddValue(index++, (ushort)m_ExtraFlags); stmt.AddValue(index++, m_stableSlots); stmt.AddValue(index++, (ushort)atLoginFlags); - stmt.AddValue(index++, GetZoneId()); stmt.AddValue(index++, m_deathExpireTime); ss.Clear(); diff --git a/sql/updates/characters/master/2021_10_02_01_characters.sql b/sql/updates/characters/master/2021_10_02_01_characters.sql new file mode 100644 index 000000000..e4c6a5e83 --- /dev/null +++ b/sql/updates/characters/master/2021_10_02_01_characters.sql @@ -0,0 +1 @@ +UPDATE `characters` SET `zone`=0 WHERE (`at_login` & 0x20) != 0;