Merge git://github.com/TrinityCore/TrinityCore into 4.x

Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt

1 files changed, 82 insertions, 0 deletions

diff --git a/src/server/game/Calendar/Calendar.cpp b/src/server/game/Calendar/Calendar.cpp
index 2c4ad943dd6..139e63614cc 100755
--- a/src/server/game/Calendar/Calendar.cpp
+++ b/src/server/game/Calendar/Calendar.cpp
@@ -15,3 +15,85 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "Player.h"
+#include "Calendar.h"
+
+std::string CalendarInvite::GetDebugString() const
+{
+    std::ostringstream data;
+
+    data << "CalendarInvite::"
+        << " inviteId: " << _inviteId
+        << " EventId: " << _eventId
+        << " Status: " << uint32(_status)
+        << " Invitee: " << _invitee
+        << " Sender: " << _senderGUID
+        << " Rank: " << uint32(_rank)
+        << " Text: " << _text;
+
+    return data.str();
+}
+
+void CalendarInvite::Init()
+{
+    _eventId = 0;
+    _invitee = 0;
+    _senderGUID = 0;
+    _statusTime = 0;
+    _status = CALENDAR_STATUS_INVITED; // default (0)?
+    _rank = CALENDAR_RANK_PLAYER;
+    _text = "";
+}
+
+std::string CalendarEvent::GetDebugString() const
+{
+    std::ostringstream data;
+
+    data << "CalendarEvent::"
+        << " EventId: " << _eventId
+        << " Title: " << _title
+        << " Description" << _description
+        << " Type: " << uint32(_type)
+        << " Max Invites: " << _maxInvites
+        << " Creator: " << _creatorGUID
+        << " Flags: " << _flags
+        << " Guild: " << _guildId
+        << " Time: " << _eventTime
+        << " Time2: " << _timezoneTime
+        << " Repeatable: " << uint32(_repeatable)
+        << " DungeonId: " << _dungeonId;
+
+    return data.str();
+}
+
+void CalendarEvent::Init()
+{
+    _creatorGUID = 0;
+    _guildId = 0;
+    _type = CALENDAR_TYPE_OTHER;
+    _dungeonId = -1;
+    _maxInvites = 0;
+    _eventTime = 0;
+    _flags = 0;
+    _repeatable = false;
+    _timezoneTime = 0;
+    _title = "";
+    _description = "";
+
+}
+
+std::string CalendarAction::GetDebugString() const
+{
+    std::ostringstream data;
+
+    data << "CalendarAction::"
+        << " Action: " << GetAction()
+        << " Guid: " << GetPlayer()->GetGUID()
+        << " Invite Id: " << GetInviteId()
+        << " Extra data: " << GetExtraData()
+        << " Event: " << Event.GetDebugString()
+        << " Invite: " << Invite.GetDebugString();
+
+    return data.str();
+}