Core/DB: Unify creature_respawn and gameobject_respawn into a single respawn table

(cherry picked from commit 374597c8e9)
This commit is contained in:
Treeston
2019-07-14 18:49:38 +02:00
committed by Shauren
parent 58fb2ef631
commit be05590a12
7 changed files with 81 additions and 126 deletions

View File

@@ -1963,32 +1963,6 @@ LOCK TABLES `corpse_phases` WRITE;
/*!40000 ALTER TABLE `corpse_phases` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `creature_respawn`
--
DROP TABLE IF EXISTS `creature_respawn`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `creature_respawn` (
`guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
`respawnTime` bigint(20) NOT NULL DEFAULT '0',
`mapId` smallint(10) unsigned NOT NULL DEFAULT '0',
`instanceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Instance Identifier',
PRIMARY KEY (`guid`,`instanceId`),
KEY `idx_instance` (`instanceId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Grid Loading System';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `creature_respawn`
--
LOCK TABLES `creature_respawn` WRITE;
/*!40000 ALTER TABLE `creature_respawn` DISABLE KEYS */;
/*!40000 ALTER TABLE `creature_respawn` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `game_event_condition_save`
--
@@ -2037,32 +2011,6 @@ LOCK TABLES `game_event_save` WRITE;
/*!40000 ALTER TABLE `game_event_save` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `gameobject_respawn`
--
DROP TABLE IF EXISTS `gameobject_respawn`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gameobject_respawn` (
`guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
`respawnTime` bigint(20) NOT NULL DEFAULT '0',
`mapId` smallint(10) unsigned NOT NULL DEFAULT '0',
`instanceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Instance Identifier',
PRIMARY KEY (`guid`,`instanceId`),
KEY `idx_instance` (`instanceId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Grid Loading System';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `gameobject_respawn`
--
LOCK TABLES `gameobject_respawn` WRITE;
/*!40000 ALTER TABLE `gameobject_respawn` DISABLE KEYS */;
/*!40000 ALTER TABLE `gameobject_respawn` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `gm_bug`
--
@@ -3529,6 +3477,33 @@ LOCK TABLES `reserved_name` WRITE;
/*!40000 ALTER TABLE `reserved_name` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `respawn`
--
DROP TABLE IF EXISTS `respawn`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `respawn` (
`type` smallint(10) unsigned NOT NULL,
`spawnId` bigint(20) unsigned NOT NULL,
`respawnTime` bigint(20) NOT NULL,
`mapId` smallint(10) unsigned NOT NULL,
`instanceId` int(10) unsigned NOT NULL,
PRIMARY KEY (`type`,`spawnId`,`instanceId`),
KEY `idx_instance` (`instanceId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Stored respawn times';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `respawn`
--
LOCK TABLES `respawn` WRITE;
/*!40000 ALTER TABLE `respawn` DISABLE KEYS */;
/*!40000 ALTER TABLE `respawn` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `updates`
--
@@ -3674,7 +3649,8 @@ INSERT INTO `updates` VALUES
('2021_10_16_00_characters.sql','B5A31BB6FBC34512767475EDF13099DEC948EBB7','ARCHIVED','2021-10-16 01:12:20',0),
('2021_11_02_00_characters.sql','A3C0A6DA70CC70803C80685E4E2ED6255156520A','ARCHIVED','2021-11-02 18:11:13',0),
('2021_11_04_00_characters.sql','ED533235ADAD174F91A6B8E51D1046243B78B46D','ARCHIVED','2021-11-04 21:53:04',0),
('2021_11_17_00_characters.sql','03A0AB8ECD8BE5D818D41A8A610097C94A9C7DB9','ARCHIVED','2021-11-17 13:23:17',0);
('2021_11_17_00_characters.sql','03A0AB8ECD8BE5D818D41A8A610097C94A9C7DB9','ARCHIVED','2021-11-17 13:23:17',0),
('2021_12_16_00_characters_2019_07_14_00_characters.sql','DC1A3D3311FCF9106B4D91F8D2C5B893AD66C093','RELEASED','2021-12-16 01:06:53',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;