mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-16 23:50:44 +01:00
Merge branch 'master' into 4.x
Conflicts: sql/base/auth_database.sql src/server/authserver/Server/AuthSocket.cpp src/server/game/AI/CoreAI/CombatAI.cpp src/server/game/AuctionHouse/AuctionHouseMgr.cpp src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/MotionMaster.cpp src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp src/server/scripts/Spells/spell_quest.cpp src/server/shared/Logging/Log.h src/server/worldserver/worldserver.conf.dist src/tools/vmap3_extractor/model.h src/tools/vmap4_extractor/CMakeLists.txt src/tools/vmap4_extractor/dbcfile.cpp src/tools/vmap4_extractor/dbcfile.h src/tools/vmap4_extractor/loadlib/loadlib.h
This commit is contained in:
Spp
@@ -1,8 +1,8 @@
|
||||
-- MySQL dump 10.11
|
||||
-- MySQL dump 10.13 Distrib 5.5.19, for Win64 (x86)
|
||||
--
|
||||
-- Host: localhost Database: realmd
|
||||
-- Host: localhost Database: auth
|
||||
-- ------------------------------------------------------
|
||||
-- Server version 5.0.45-Debian_1ubuntu3.1-log
|
||||
-- Server version 5.5.19
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
@@ -15,30 +15,6 @@
|
||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||
|
||||
--
|
||||
-- Table structure for table `account_access`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `account_access`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `account_access` (
|
||||
`id` int(11) unsigned NOT NULL,
|
||||
`gmlevel` tinyint(3) unsigned NOT NULL,
|
||||
`RealmID` int(11) NOT NULL default '-1',
|
||||
PRIMARY KEY (`id`,`RealmID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `account_access`
|
||||
--
|
||||
|
||||
LOCK TABLES `account_access` WRITE;
|
||||
/*!40000 ALTER TABLE `account_access` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `account_access` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `account`
|
||||
--
|
||||
@@ -47,26 +23,27 @@ DROP TABLE IF EXISTS `account`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `account` (
|
||||
`id` int(11) unsigned NOT NULL auto_increment COMMENT 'Identifier',
|
||||
`username` varchar(32) NOT NULL default '',
|
||||
`sha_pass_hash` varchar(40) NOT NULL default '',
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
|
||||
`username` varchar(32) NOT NULL DEFAULT '',
|
||||
`sha_pass_hash` varchar(40) NOT NULL DEFAULT '',
|
||||
`sessionkey` longtext,
|
||||
`v` longtext,
|
||||
`s` longtext,
|
||||
`email` text,
|
||||
`joindate` timestamp NOT NULL default CURRENT_TIMESTAMP,
|
||||
`last_ip` varchar(30) NOT NULL default '127.0.0.1',
|
||||
`failed_logins` int(11) unsigned NOT NULL default '0',
|
||||
`locked` tinyint(3) unsigned NOT NULL default '0',
|
||||
`last_login` timestamp NOT NULL default '0000-00-00 00:00:00',
|
||||
`online` tinyint(4) NOT NULL default '0',
|
||||
`expansion` tinyint(3) unsigned NOT NULL default '3',
|
||||
`mutetime` bigint(40) NOT NULL default '0',
|
||||
`locale` tinyint(3) unsigned NOT NULL default '0',
|
||||
`recruiter` int(11) NOT NULL default '0',
|
||||
PRIMARY KEY (`id`),
|
||||
`joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`last_ip` varchar(30) NOT NULL DEFAULT '127.0.0.1',
|
||||
`failed_logins` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`online` tinyint(4) NOT NULL DEFAULT '0',
|
||||
`expansion` tinyint(3) unsigned NOT NULL DEFAULT '2',
|
||||
`mutetime` bigint(40) NOT NULL DEFAULT '0',
|
||||
`locale` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`os` varchar(4) NOT NULL DEFAULT '',
|
||||
`recruiter` int(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `idx_username` (`username`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC COMMENT='Account System';
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Account System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
@@ -78,6 +55,30 @@ LOCK TABLES `account` WRITE;
|
||||
/*!40000 ALTER TABLE `account` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `account_access`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `account_access`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `account_access` (
|
||||
`id` int(11) unsigned NOT NULL,
|
||||
`gmlevel` tinyint(3) unsigned NOT NULL,
|
||||
`RealmID` int(11) NOT NULL DEFAULT '-1',
|
||||
PRIMARY KEY (`id`,`RealmID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `account_access`
|
||||
--
|
||||
|
||||
LOCK TABLES `account_access` WRITE;
|
||||
/*!40000 ALTER TABLE `account_access` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `account_access` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `account_banned`
|
||||
--
|
||||
@@ -86,13 +87,13 @@ DROP TABLE IF EXISTS `account_banned`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `account_banned` (
|
||||
`id` int(11) NOT NULL default '0' COMMENT 'Account id',
|
||||
`bandate` bigint(40) NOT NULL default '0',
|
||||
`unbandate` bigint(40) NOT NULL default '0',
|
||||
`id` int(11) NOT NULL DEFAULT '0' COMMENT 'Account id',
|
||||
`bandate` bigint(40) NOT NULL DEFAULT '0',
|
||||
`unbandate` bigint(40) NOT NULL DEFAULT '0',
|
||||
`bannedby` varchar(50) NOT NULL,
|
||||
`banreason` varchar(255) NOT NULL,
|
||||
`active` tinyint(4) NOT NULL default '1',
|
||||
PRIMARY KEY (`id`,`bandate`)
|
||||
`active` tinyint(4) NOT NULL DEFAULT '1',
|
||||
PRIMARY KEY (`id`,`bandate`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Ban List';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -113,12 +114,12 @@ DROP TABLE IF EXISTS `ip_banned`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `ip_banned` (
|
||||
`ip` varchar(32) NOT NULL default '127.0.0.1',
|
||||
`ip` varchar(32) NOT NULL DEFAULT '127.0.0.1',
|
||||
`bandate` bigint(40) NOT NULL,
|
||||
`unbandate` bigint(40) NOT NULL,
|
||||
`bannedby` varchar(50) NOT NULL default '[Console]',
|
||||
`banreason` varchar(255) NOT NULL default 'no reason',
|
||||
PRIMARY KEY (`ip`,`bandate`)
|
||||
`bannedby` varchar(50) NOT NULL DEFAULT '[Console]',
|
||||
`banreason` varchar(255) NOT NULL DEFAULT 'no reason',
|
||||
PRIMARY KEY (`ip`,`bandate`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Banned IPs';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -163,11 +164,11 @@ DROP TABLE IF EXISTS `realmcharacters`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `realmcharacters` (
|
||||
`realmid` int(11) unsigned NOT NULL default '0',
|
||||
`realmid` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`acctid` bigint(20) unsigned NOT NULL,
|
||||
`numchars` tinyint(3) unsigned NOT NULL default '0',
|
||||
PRIMARY KEY (`realmid`,`acctid`),
|
||||
KEY (acctid)
|
||||
`numchars` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`realmid`,`acctid`),
|
||||
KEY `acctid` (`acctid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm Character Tracker';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -188,17 +189,17 @@ DROP TABLE IF EXISTS `realmlist`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `realmlist` (
|
||||
`id` int(11) unsigned NOT NULL auto_increment,
|
||||
`name` varchar(32) NOT NULL default '',
|
||||
`address` varchar(32) NOT NULL default '127.0.0.1',
|
||||
`port` int(11) NOT NULL default '8085',
|
||||
`icon` tinyint(3) unsigned NOT NULL default '0',
|
||||
`color` tinyint(3) unsigned NOT NULL default '2',
|
||||
`timezone` tinyint(3) unsigned NOT NULL default '0',
|
||||
`allowedSecurityLevel` tinyint(3) unsigned NOT NULL default '0',
|
||||
`population` float unsigned NOT NULL default '0',
|
||||
`gamebuild` int(11) unsigned NOT NULL default '14545',
|
||||
PRIMARY KEY (`id`),
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(32) NOT NULL DEFAULT '',
|
||||
`address` varchar(32) NOT NULL DEFAULT '127.0.0.1',
|
||||
`port` int(11) NOT NULL DEFAULT '8085',
|
||||
`icon` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`color` tinyint(3) unsigned NOT NULL DEFAULT '2',
|
||||
`timezone` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`allowedSecurityLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`population` float unsigned NOT NULL DEFAULT '0',
|
||||
`gamebuild` int(11) unsigned NOT NULL DEFAULT '14545',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `idx_name` (`name`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -223,12 +224,12 @@ DROP TABLE IF EXISTS `uptime`;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `uptime` (
|
||||
`realmid` int(11) unsigned NOT NULL,
|
||||
`starttime` bigint(20) unsigned NOT NULL default '0',
|
||||
`startstring` varchar(64) NOT NULL default '',
|
||||
`uptime` bigint(20) unsigned NOT NULL default '0',
|
||||
`maxplayers` smallint(5) unsigned NOT NULL default '0',
|
||||
`revision` VARCHAR(255) NOT NULL DEFAULT 'Trinitycore',
|
||||
PRIMARY KEY (`realmid`,`starttime`)
|
||||
`starttime` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`startstring` varchar(64) NOT NULL DEFAULT '',
|
||||
`uptime` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`maxplayers` smallint(5) unsigned NOT NULL DEFAULT '0',
|
||||
`revision` varchar(255) NOT NULL DEFAULT 'Trinitycore',
|
||||
PRIMARY KEY (`realmid`,`starttime`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -250,6 +251,4 @@ UNLOCK TABLES;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2008-01-10 11:37:06
|
||||
|
||||
-- Updated on 2010-01-29 23:21:45 GMT+1
|
||||
-- Dump completed on 2012-02-19 13:18:35
|
||||
|
||||
Reference in New Issue
Block a user