From 44f4265f584198d67f8b5ecceb4c0af8eede017a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 1 Feb 2017 17:20:44 +0100 Subject: [PATCH] Core/World: readd lines lost in rebase --- src/server/game/Storages/WhoListStorage.cpp | 30 ++++++++++----------- src/server/game/Storages/WhoListStorage.h | 30 ++++++++++----------- src/server/game/World/World.cpp | 3 +++ 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/server/game/Storages/WhoListStorage.cpp b/src/server/game/Storages/WhoListStorage.cpp index c213445c7bb..c11886f6a5e 100644 --- a/src/server/game/Storages/WhoListStorage.cpp +++ b/src/server/game/Storages/WhoListStorage.cpp @@ -1,19 +1,19 @@ /* -* Copyright (C) 2008-2016 TrinityCore -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2 of the License, or (at your -* option) any later version. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along -* with this program. If not, see . -*/ + * Copyright (C) 2008-2017 TrinityCore + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ #include "WhoListStorage.h" #include "World.h" diff --git a/src/server/game/Storages/WhoListStorage.h b/src/server/game/Storages/WhoListStorage.h index 7bcd43dc53b..0b371fdf1e9 100644 --- a/src/server/game/Storages/WhoListStorage.h +++ b/src/server/game/Storages/WhoListStorage.h @@ -1,19 +1,19 @@ /* -* Copyright (C) 2008-2016 TrinityCore -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2 of the License, or (at your -* option) any later version. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along -* with this program. If not, see . -*/ + * Copyright (C) 2008-2017 TrinityCore + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ #ifndef _WHOLISTSTORAGE_H #define _WHOLISTSTORAGE_H diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index b72dc72d07c..dcfb456b9d1 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -3447,6 +3447,9 @@ void World::AddCharacterInfo(ObjectGuid const& guid, uint32 accountId, std::stri data.GuildId = 0; // Will be set in guild loading or guild setting for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i) data.ArenaTeamId[i] = 0; // Will be set in arena teams loading + + // Fill Name to Guid Store + _characterGuidByNameStore[name] = guid; } void World::DeleteCharacterInfo(ObjectGuid const& guid, std::string const& name)