Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Spells/spell_generic.cpp
This commit is contained in:
Vincent_Michael
2013-02-04 22:14:56 +01:00
parent 1537de5b39 8f6e9dc85c
commit 12c8cdc26c
54 changed files with 3319 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
sql/base/characters_database.sql
View File

@@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 5.5.21, for Win64 (x86)
-- MySQL dump 10.13 Distrib 5.6.9-rc, for Win64 (x86_64)
--
-- Host: localhost Database: characters_4x
-- ------------------------------------------------------
-- Server version 5.5.21
-- Server version 5.6.9-rc
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -244,7 +244,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `calendar_events`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `calendar_events` (
CREATE TABLE `calendar_events` (
`id` bigint(20) unsigned NOT NULL DEFAULT '0',
`creator` int(10) unsigned NOT NULL DEFAULT '0',
`title` varchar(255) NOT NULL DEFAULT '',
@@ -258,6 +258,15 @@ CREATE TABLE IF NOT EXISTS `calendar_events` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `calendar_events`
--
LOCK TABLES `calendar_events` WRITE;
/*!40000 ALTER TABLE `calendar_events` DISABLE KEYS */;
/*!40000 ALTER TABLE `calendar_events` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `calendar_invites`
--
@@ -265,7 +274,7 @@ CREATE TABLE IF NOT EXISTS `calendar_events` (
DROP TABLE IF EXISTS `calendar_invites`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `calendar_invites` (
CREATE TABLE `calendar_invites` (
`id` bigint(20) unsigned NOT NULL DEFAULT '0',
`event` bigint(20) unsigned NOT NULL DEFAULT '0',
`invitee` int(10) unsigned NOT NULL DEFAULT '0',
@@ -278,6 +287,15 @@ CREATE TABLE IF NOT EXISTS `calendar_invites` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `calendar_invites`
--
LOCK TABLES `calendar_invites` WRITE;
/*!40000 ALTER TABLE `calendar_invites` DISABLE KEYS */;
/*!40000 ALTER TABLE `calendar_invites` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `channels`
--
@@ -949,6 +967,30 @@ LOCK TABLES `character_queststatus_daily` WRITE;
/*!40000 ALTER TABLE `character_queststatus_daily` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `character_queststatus_monthly`
--
DROP TABLE IF EXISTS `character_queststatus_monthly`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `character_queststatus_monthly` (
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
`quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
PRIMARY KEY (`guid`,`quest`),
KEY `idx_guid` (`guid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `character_queststatus_monthly`
--
LOCK TABLES `character_queststatus_monthly` WRITE;
/*!40000 ALTER TABLE `character_queststatus_monthly` DISABLE KEYS */;
/*!40000 ALTER TABLE `character_queststatus_monthly` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `character_queststatus_rewarded`
--
@@ -997,30 +1039,6 @@ LOCK TABLES `character_queststatus_seasonal` WRITE;
/*!40000 ALTER TABLE `character_queststatus_seasonal` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `character_queststatus_monthly`
--
DROP TABLE IF EXISTS `character_queststatus_monthly`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `character_queststatus_monthly` (
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
`quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
PRIMARY KEY (`guid`,`quest`),
KEY `idx_guid` (`guid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `character_queststatus_monthly`
--
LOCK TABLES `character_queststatus_monthly` WRITE;
/*!40000 ALTER TABLE `character_queststatus_monthly` DISABLE KEYS */;
/*!40000 ALTER TABLE `character_queststatus_monthly` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `character_queststatus_weekly`
--
@@ -2009,7 +2027,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `guild_member_withdraw`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `guild_member_withdraw` (
CREATE TABLE `guild_member_withdraw` (
`guid` int(10) unsigned NOT NULL,
`tab0` int(10) unsigned NOT NULL DEFAULT '0',
`tab1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2204,6 +2222,15 @@ CREATE TABLE `item_loot_items` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `item_loot_items`
--
LOCK TABLES `item_loot_items` WRITE;
/*!40000 ALTER TABLE `item_loot_items` DISABLE KEYS */;
/*!40000 ALTER TABLE `item_loot_items` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `item_loot_money`
--
@@ -2217,6 +2244,15 @@ CREATE TABLE `item_loot_money` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `item_loot_money`
--
LOCK TABLES `item_loot_money` WRITE;
/*!40000 ALTER TABLE `item_loot_money` DISABLE KEYS */;
/*!40000 ALTER TABLE `item_loot_money` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `item_refund_instance`
--
@@ -2621,4 +2657,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2012-09-10 11:54:51
-- Dump completed on 2013-02-04 16:22:06