Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit b0d662549ac4498d0253330d19ab21cbd0f6ce5e 2 parents 3cb8912 + 4349aa8
@Plike authored
View
1,700 sql/characters.sql
1,097 additions, 603 deletions not shown
View
180 sql/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
`version` varchar(120) default NULL,
`creature_ai_version` varchar(120) default NULL,
`cache_id` int(10) default '0',
- `required_11876_01_mangos_creature_linking_template` bit(1) default NULL
+ `required_11885_01_mangos_spell_proc_event` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--
@@ -1224,92 +1224,94 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `creature_template`;
CREATE TABLE `creature_template` (
- `entry` mediumint(8) unsigned NOT NULL default '0',
- `difficulty_entry_1` mediumint(8) unsigned NOT NULL default '0',
- `difficulty_entry_2` mediumint(8) unsigned NOT NULL default '0',
- `difficulty_entry_3` mediumint(8) unsigned NOT NULL default '0',
- `KillCredit1` int(11) unsigned NOT NULL default '0',
- `KillCredit2` int(11) unsigned NOT NULL default '0',
- `modelid_1` mediumint(8) unsigned NOT NULL default '0',
- `modelid_2` mediumint(8) unsigned NOT NULL default '0',
- `modelid_3` mediumint(8) unsigned NOT NULL default '0',
- `modelid_4` mediumint(8) unsigned NOT NULL default '0',
- `name` char(100) NOT NULL default '0',
- `subname` char(100) default NULL,
- `IconName` char(100) default NULL,
- `gossip_menu_id` mediumint(8) unsigned NOT NULL default '0',
- `minlevel` tinyint(3) unsigned NOT NULL default '1',
- `maxlevel` tinyint(3) unsigned NOT NULL default '1',
- `minhealth` int(10) unsigned NOT NULL default '0',
- `maxhealth` int(10) unsigned NOT NULL default '0',
- `minmana` int(10) unsigned NOT NULL default '0',
- `maxmana` int(10) unsigned NOT NULL default '0',
- `armor` mediumint(8) unsigned NOT NULL default '0',
- `faction_A` smallint(5) unsigned NOT NULL default '0',
- `faction_H` smallint(5) unsigned NOT NULL default '0',
- `npcflag` int(10) unsigned NOT NULL default '0',
- `speed_walk` float NOT NULL default '1' COMMENT 'Result of 2.5/2.5, most common value',
- `speed_run` float NOT NULL default '1.14286' COMMENT 'Result of 8.0/7.0, most common value',
- `scale` float NOT NULL default '1',
- `rank` tinyint(3) unsigned NOT NULL default '0',
- `mindmg` float NOT NULL default '0',
- `maxdmg` float NOT NULL default '0',
- `dmgschool` tinyint(4) NOT NULL default '0',
- `attackpower` int(10) unsigned NOT NULL default '0',
- `dmg_multiplier` float NOT NULL default '1',
- `baseattacktime` int(10) unsigned NOT NULL default '0',
- `rangeattacktime` int(10) unsigned NOT NULL default '0',
- `unit_class` tinyint(3) unsigned NOT NULL default '0',
- `unit_flags` int(10) unsigned NOT NULL default '0',
- `dynamicflags` int(10) unsigned NOT NULL default '0',
- `family` tinyint(4) NOT NULL default '0',
- `trainer_type` tinyint(4) NOT NULL default '0',
- `trainer_spell` mediumint(8) unsigned NOT NULL default '0',
- `trainer_class` tinyint(3) unsigned NOT NULL default '0',
- `trainer_race` tinyint(3) unsigned NOT NULL default '0',
- `minrangedmg` float NOT NULL default '0',
- `maxrangedmg` float NOT NULL default '0',
- `rangedattackpower` smallint(5) unsigned NOT NULL default '0',
- `type` tinyint(3) unsigned NOT NULL default '0',
- `type_flags` int(10) unsigned NOT NULL default '0',
- `lootid` mediumint(8) unsigned NOT NULL default '0',
- `pickpocketloot` mediumint(8) unsigned NOT NULL default '0',
- `skinloot` mediumint(8) unsigned NOT NULL default '0',
- `resistance1` smallint(5) NOT NULL default '0',
- `resistance2` smallint(5) NOT NULL default '0',
- `resistance3` smallint(5) NOT NULL default '0',
- `resistance4` smallint(5) NOT NULL default '0',
- `resistance5` smallint(5) NOT NULL default '0',
- `resistance6` smallint(5) NOT NULL default '0',
- `spell1` mediumint(8) unsigned NOT NULL default '0',
- `spell2` mediumint(8) unsigned NOT NULL default '0',
- `spell3` mediumint(8) unsigned NOT NULL default '0',
- `spell4` mediumint(8) unsigned NOT NULL default '0',
- `PetSpellDataId` mediumint(8) unsigned NOT NULL default '0',
- `mingold` mediumint(8) unsigned NOT NULL default '0',
- `maxgold` mediumint(8) unsigned NOT NULL default '0',
- `AIName` char(64) NOT NULL default '',
- `MovementType` tinyint(3) unsigned NOT NULL default '0',
- `InhabitType` tinyint(3) unsigned NOT NULL default '3',
- `unk16` float NOT NULL default '1',
- `unk17` float NOT NULL default '1',
- `RacialLeader` tinyint(3) unsigned NOT NULL default '0',
- `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `questItem5` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `questItem6` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `movementId` int(11) UNSIGNED DEFAULT '0' NOT NULL,
- `RegenHealth` tinyint(3) unsigned NOT NULL default '1',
- `vehicle_id` mediumint(8) unsigned NOT NULL default '0',
- `equipment_id` mediumint(8) unsigned NOT NULL default '0',
- `trainer_id` mediumint(8) unsigned NOT NULL default '0',
- `vendor_id` mediumint(8) unsigned NOT NULL default '0',
- `mechanic_immune_mask` int(10) unsigned NOT NULL default '0',
- `flags_extra` int(10) unsigned NOT NULL default '0',
- `ScriptName` char(64) NOT NULL default '',
- PRIMARY KEY (`entry`)
+ `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `difficulty_entry_1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `difficulty_entry_2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `difficulty_entry_3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `KillCredit1` int(11) unsigned NOT NULL DEFAULT '0',
+ `KillCredit2` int(11) unsigned NOT NULL DEFAULT '0',
+ `modelid_1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `modelid_2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `modelid_3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `modelid_4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `name` char(100) NOT NULL DEFAULT '0',
+ `subname` char(100) DEFAULT NULL,
+ `IconName` char(100) DEFAULT NULL,
+ `gossip_menu_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `minlevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `maxlevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `minhealth` int(10) unsigned NOT NULL DEFAULT '0',
+ `maxhealth` int(10) unsigned NOT NULL DEFAULT '0',
+ `powertype` int(10) unsigned NOT NULL DEFAULT '0',
+ `minmana` int(10) unsigned NOT NULL DEFAULT '0',
+ `maxmana` int(10) unsigned NOT NULL DEFAULT '0',
+ `armor` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `faction_A` smallint(5) unsigned NOT NULL DEFAULT '0',
+ `faction_H` smallint(5) unsigned NOT NULL DEFAULT '0',
+ `npcflag` int(10) unsigned NOT NULL DEFAULT '0',
+ `speed_walk` float NOT NULL DEFAULT '1' COMMENT 'Result of 2.5/2.5, most common value',
+ `speed_run` float NOT NULL DEFAULT '1.14286' COMMENT 'Result of 8.0/7.0, most common value',
+ `scale` float NOT NULL DEFAULT '1',
+ `rank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `mindmg` float NOT NULL DEFAULT '0',
+ `maxdmg` float NOT NULL DEFAULT '0',
+ `dmgschool` tinyint(4) NOT NULL DEFAULT '0',
+ `attackpower` int(10) unsigned NOT NULL DEFAULT '0',
+ `dmg_multiplier` float NOT NULL DEFAULT '1',
+ `baseattacktime` int(10) unsigned NOT NULL DEFAULT '0',
+ `rangeattacktime` int(10) unsigned NOT NULL DEFAULT '0',
+ `unit_class` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
+ `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
+ `family` tinyint(4) NOT NULL DEFAULT '0',
+ `trainer_type` tinyint(4) NOT NULL DEFAULT '0',
+ `trainer_spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `trainer_class` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `trainer_race` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `minrangedmg` float NOT NULL DEFAULT '0',
+ `maxrangedmg` float NOT NULL DEFAULT '0',
+ `rangedattackpower` smallint(5) unsigned NOT NULL DEFAULT '0',
+ `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `type_flags` int(10) unsigned NOT NULL DEFAULT '0',
+ `lootid` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `pickpocketloot` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `skinloot` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `resistance1` smallint(5) NOT NULL DEFAULT '0',
+ `resistance2` smallint(5) NOT NULL DEFAULT '0',
+ `resistance3` smallint(5) NOT NULL DEFAULT '0',
+ `resistance4` smallint(5) NOT NULL DEFAULT '0',
+ `resistance5` smallint(5) NOT NULL DEFAULT '0',
+ `resistance6` smallint(5) NOT NULL DEFAULT '0',
+ `spell1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `spell2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `spell3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `spell4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `PetSpellDataId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `vehicle_id` mediumint(8) NOT NULL DEFAULT '0',
+ `mingold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `maxgold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `AIName` char(64) NOT NULL DEFAULT '',
+ `MovementType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `InhabitType` tinyint(3) unsigned NOT NULL DEFAULT '3',
+ `unk16` float NOT NULL DEFAULT '1',
+ `unk17` float NOT NULL DEFAULT '1',
+ `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `questItem1` int(11) unsigned NOT NULL DEFAULT '0',
+ `questItem2` int(11) unsigned NOT NULL DEFAULT '0',
+ `questItem3` int(11) unsigned NOT NULL DEFAULT '0',
+ `questItem4` int(11) unsigned NOT NULL DEFAULT '0',
+ `questItem5` int(11) unsigned NOT NULL DEFAULT '0',
+ `questItem6` int(11) unsigned NOT NULL DEFAULT '0',
+ `movementId` int(11) unsigned NOT NULL DEFAULT '0',
+ `RegenHealth` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `equipment_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `trainer_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `vendor_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `mechanic_immune_mask` int(10) unsigned NOT NULL DEFAULT '0',
+ `flags_extra` int(10) unsigned NOT NULL DEFAULT '0',
+ `ScriptName` char(64) NOT NULL DEFAULT '',
+ PRIMARY KEY (`entry`),
+ KEY `idx_name` (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System';
--
@@ -1319,7 +1321,7 @@ CREATE TABLE `creature_template` (
LOCK TABLES `creature_template` WRITE;
/*!40000 ALTER TABLE `creature_template` DISABLE KEYS */;
INSERT INTO `creature_template` VALUES
-(1,0,0,0,0,0,10045,0,0,0,'Waypoint(Only GM can see it)','Visual',NULL,0,1,1,64,64,0,0,5,35,35,0,0.91,1.14286,1,0,2,3,0,10,1,2000,2200,8,4096,0,0,0,0,0,0,1,2,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,130,'');
+(1,0,0,0,0,0,10045,0,0,0,'Waypoint (Only GM can see it)','Visual',NULL,0,1,1,8,8,0,0,0,7,35,35,0,0.91,1.14286,1,0,2,2,0,24,1,2000,2200,1,4096,0,0,0,0,0,0,1,1,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,130,'');
/*!40000 ALTER TABLE `creature_template` ENABLE KEYS */;
UNLOCK TABLES;
@@ -3227,6 +3229,7 @@ INSERT INTO `mangos_string` VALUES
(64,"Doesn't accept whispers", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(65,'Using script library: <Unknown Script Library>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(66,'Using script library: <No Script Library Loaded>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(67,'Update diff: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(100,'Global notify: ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(101,'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(102,'%s is already being teleported.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -17771,6 +17774,7 @@ INSERT INTO `spell_proc_event` VALUES
(71761, 0x00, 3, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0.000000, 0.000000, 0),
(71880, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 0),
(71892, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 0),
+(72413, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000,20.000000, 60),
(74396, 0x00, 3, 0x28E212F7, 0x28E212F7, 0x28E212F7, 0x00119048, 0x00119048, 0x00119048, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0),
(75455, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
(75457, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
View
267 sql/realmd.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.11
+-- MySQL dump 10.13 Distrib 5.1.58, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: realmd
-- ------------------------------------------------------
--- Server version 5.0.45-Debian_1ubuntu3.1-log
+-- Server version 5.1.58-1ubuntu1
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -16,52 +16,35 @@
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
--- Table structure for table `realmd_db_version`
---
-
-DROP TABLE IF EXISTS `realmd_db_version`;
-CREATE TABLE `realmd_db_version` (
- `required_10008_01_realmd_realmd_db_version` bit(1) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
-
---
--- Dumping data for table `realmd_db_version`
---
-
-LOCK TABLES `realmd_db_version` WRITE;
-/*!40000 ALTER TABLE `realmd_db_version` DISABLE KEYS */;
-INSERT INTO `realmd_db_version` VALUES
-(NULL);
-/*!40000 ALTER TABLE `realmd_db_version` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
-- Table structure for table `account`
--
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 '',
- `gmlevel` tinyint(3) unsigned NOT NULL default '0',
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
+ `username` varchar(32) NOT NULL DEFAULT '',
+ `sha_pass_hash` varchar(40) NOT NULL DEFAULT '',
+ `gmlevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
`sessionkey` longtext,
`v` longtext,
`s` longtext,
`email` text,
- `joindate` timestamp NOT NULL default CURRENT_TIMESTAMP,
- `last_ip` varchar(30) NOT NULL default '0.0.0.0',
- `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',
- `active_realm_id` int(11) unsigned NOT NULL default '0',
- `expansion` tinyint(3) unsigned NOT NULL default '0',
- `mutetime` bigint(40) unsigned NOT NULL default '0',
- `locale` tinyint(3) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ `joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `last_ip` varchar(30) NOT NULL DEFAULT '0.0.0.0',
+ `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',
+ `active_realm_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `mutetime` bigint(40) unsigned NOT NULL DEFAULT '0',
+ `locale` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
UNIQUE KEY `idx_username` (`username`),
KEY `idx_gmlevel` (`gmlevel`)
-) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC COMMENT='Account System';
+) ENGINE=MyISAM AUTO_INCREMENT=104540 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Account System';
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `account`
@@ -69,11 +52,6 @@ CREATE TABLE `account` (
LOCK TABLES `account` WRITE;
/*!40000 ALTER TABLE `account` DISABLE KEYS */;
-INSERT INTO `account` VALUES
-(1,'ADMINISTRATOR','a34b29541b87b7e4823683ce6c7bf6ae68beaaac',3,'','0','0','','2006-04-25 10:18:56','127.0.0.1',0,0,'0000-00-00 00:00:00',0,0,0,0),
-(2,'GAMEMASTER','7841e21831d7c6bc0b57fbe7151eb82bd65ea1f9',2,'','0','0','','2006-04-25 10:18:56','127.0.0.1',0,0,'0000-00-00 00:00:00',0,0,0,0),
-(3,'MODERATOR','a7f5fbff0b4eec2d6b6e78e38e8312e64d700008',1,'','0','0','','2006-04-25 10:19:35','127.0.0.1',0,0,'0000-00-00 00:00:00',0,0,0,0),
-(4,'PLAYER','3ce8a96d17c5ae88a30681024e86279f1a38c041',0,'','0','0','','2006-04-25 10:19:35','127.0.0.1',0,0,'0000-00-00 00:00:00',0,0,0,0);
/*!40000 ALTER TABLE `account` ENABLE KEYS */;
UNLOCK TABLES;
@@ -82,15 +60,18 @@ UNLOCK TABLES;
--
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 */;
--
-- Dumping data for table `account_banned`
@@ -102,18 +83,72 @@ LOCK TABLES `account_banned` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `account_friends`
+--
+
+DROP TABLE IF EXISTS `account_friends`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account_friends` (
+ `id` int(11) unsigned NOT NULL DEFAULT '0',
+ `friend_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `bind_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Bring date',
+ `expire_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'Expire date',
+ PRIMARY KEY (`id`,`friend_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores accounts for refer-a-friend system.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `account_friends`
+--
+
+LOCK TABLES `account_friends` WRITE;
+/*!40000 ALTER TABLE `account_friends` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_friends` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `account_muted`
+--
+
+DROP TABLE IF EXISTS `account_muted`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account_muted` (
+ `account_id` int(11) NOT NULL DEFAULT '0' COMMENT 'Account id',
+ `mutetime` bigint(40) NOT NULL DEFAULT '0',
+ `mutedby` varchar(50) NOT NULL,
+ `mutereason` varchar(255) NOT NULL,
+ `active` tinyint(4) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`account_id`,`mutetime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Ban List';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `account_muted`
+--
+
+LOCK TABLES `account_muted` WRITE;
+/*!40000 ALTER TABLE `account_muted` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_muted` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `ip_banned`
--
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 '0.0.0.0',
+ `ip` varchar(32) NOT NULL DEFAULT '0.0.0.0',
`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 */;
--
-- Dumping data for table `ip_banned`
@@ -125,17 +160,44 @@ LOCK TABLES `ip_banned` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `online_log`
+--
+
+DROP TABLE IF EXISTS `online_log`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `online_log` (
+ `timestamp` bigint(20) unsigned NOT NULL,
+ `online_a` int(10) unsigned NOT NULL DEFAULT '0',
+ `online_h` int(10) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`timestamp`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `online_log`
+--
+
+LOCK TABLES `online_log` WRITE;
+/*!40000 ALTER TABLE `online_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `online_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `realmcharacters`
--
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 */;
--
-- Dumping data for table `realmcharacters`
@@ -147,24 +209,49 @@ LOCK TABLES `realmcharacters` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `realmd_db_version`
+--
+
+DROP TABLE IF EXISTS `realmd_db_version`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `realmd_db_version` (
+ `required_10008_01_realmd_realmd_db_version` bit(1) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `realmd_db_version`
+--
+
+LOCK TABLES `realmd_db_version` WRITE;
+/*!40000 ALTER TABLE `realmd_db_version` DISABLE KEYS */;
+INSERT INTO `realmd_db_version` VALUES (NULL);
+/*!40000 ALTER TABLE `realmd_db_version` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `realmlist`
--
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',
- `realmflags` tinyint(3) unsigned NOT NULL default '2' COMMENT 'Supported masks: 0x1 (invalid, not show in realm list), 0x2 (offline, set by mangosd), 0x4 (show version and build), 0x20 (new players), 0x40 (recommended)',
- `timezone` tinyint(3) unsigned NOT NULL default '0',
- `allowedSecurityLevel` tinyint(3) unsigned NOT NULL default '0',
- `population` float unsigned NOT NULL default '0',
- `realmbuilds` varchar(64) NOT NULL default '',
- 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',
+ `realmflags` tinyint(3) unsigned NOT NULL DEFAULT '2' COMMENT 'Supported masks: 0x1 (invalid, not show in realm list), 0x2 (offline, set by mangosd), 0x4 (show version and build), 0x20 (new players), 0x40 (recommended)',
+ `timezone` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `allowedSecurityLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `population` float unsigned NOT NULL DEFAULT '0',
+ `realmbuilds` varchar(64) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
UNIQUE KEY `idx_name` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm System';
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm System';
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `realmlist`
@@ -172,24 +259,53 @@ CREATE TABLE `realmlist` (
LOCK TABLES `realmlist` WRITE;
/*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
-INSERT INTO `realmlist` VALUES
-(1,'MaNGOS','127.0.0.1',8085,1,0,1,0,0,'');
+INSERT INTO `realmlist` VALUES (1,'GCcore','127.0.0.1',8085,8,0,1,0,0,'12340 ');
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
UNLOCK TABLES;
--
+-- Table structure for table `revision_log`
+--
+
+DROP TABLE IF EXISTS `revision_log`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `revision_log` (
+ `timestamp` bigint(20) unsigned NOT NULL DEFAULT '0',
+ `mangos_rev` int(10) unsigned NOT NULL DEFAULT '0',
+ `gc_core_rev` varchar(50) CHARACTER SET latin1 NOT NULL DEFAULT '0',
+ `gc_core_rev_date` varchar(50) CHARACTER SET latin1 NOT NULL,
+ `sd2_rev` int(10) unsigned NOT NULL DEFAULT '0',
+ `gc_scripts_rev` int(10) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`timestamp`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `revision_log`
+--
+
+LOCK TABLES `revision_log` WRITE;
+/*!40000 ALTER TABLE `revision_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `revision_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `uptime`
--
DROP TABLE IF EXISTS `uptime`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!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',
- 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',
+ PRIMARY KEY (`realmid`,`starttime`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system';
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `uptime`
@@ -197,6 +313,7 @@ CREATE TABLE `uptime` (
LOCK TABLES `uptime` WRITE;
/*!40000 ALTER TABLE `uptime` DISABLE KEYS */;
+INSERT INTO `uptime` VALUES (1,1331205052,'2012-03-08 12:10:52',0,0),(1,1331205125,'2012-03-08 12:12:05',0,0);
/*!40000 ALTER TABLE `uptime` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -209,4 +326,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
+-- Dump completed on 2012-03-08 12:16:02
View
1  src/game/BattleGroundRV.cpp
@@ -20,6 +20,7 @@
#include "BattleGround.h"
#include "BattleGroundRV.h"
#include "Language.h"
+#include "ObjectMgr.h"
BattleGroundRV::BattleGroundRV()
{
View
5 src/game/GuildHandler.cpp
@@ -140,14 +140,10 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
std::string plName;
recvPacket >> plName;
- Player * player = NULL;
if (!normalizePlayerName(plName))
return;
- if(normalizePlayerName(plName))
- player = ObjectAccessor::FindPlayerByName(plName.c_str());
-
Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
if (!guild)
{
@@ -162,6 +158,7 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
}
MemberSlot* slot = guild->GetMemberSlot(plName);
+ Player *player = sObjectMgr.GetPlayer(slot->guid);
if (!slot || !player)
{
SendGuildCommandResult(GUILD_INVITE_S, plName, ERR_GUILD_PLAYER_NOT_IN_GUILD_S);
Please sign in to comment.
Something went wrong with that request. Please try again.