Core/DB: Merge pool_creature, pool_gameobject and pool_pool into a single pool_members table.
Port From (https://github.com/TrinityCore/TrinityCore/commit/8b78f5055640bd606751d2ccc9549d14fd1d552e)
This commit is contained in:
@@ -71,8 +71,8 @@ namespace Game
|
||||
{
|
||||
uint oldMSTime = Time.GetMSTime();
|
||||
|
||||
// 1 2 3
|
||||
SQLResult result = DB.World.Query("SELECT guid, pool_entry, chance FROM pool_creature");
|
||||
// 1 2 3
|
||||
SQLResult result = DB.World.Query("SELECT spawnId, poolSpawnId, chance FROM pool_members WHERE type = 0");
|
||||
|
||||
if (result.IsEmpty())
|
||||
{
|
||||
@@ -128,8 +128,8 @@ namespace Game
|
||||
{
|
||||
uint oldMSTime = Time.GetMSTime();
|
||||
|
||||
// 1 2 3
|
||||
SQLResult result = DB.World.Query("SELECT guid, pool_entry, chance FROM pool_gameobject");
|
||||
// 1 2 3
|
||||
SQLResult result = DB.World.Query("SELECT spawnId, poolSpawnId, chance FROM pool_members WHERE type = 1");
|
||||
|
||||
if (result.IsEmpty())
|
||||
{
|
||||
@@ -198,8 +198,8 @@ namespace Game
|
||||
{
|
||||
uint oldMSTime = Time.GetMSTime();
|
||||
|
||||
// 1 2 3
|
||||
SQLResult result = DB.World.Query("SELECT pool_id, mother_pool, chance FROM pool_pool");
|
||||
// 1 2 3
|
||||
SQLResult result = DB.World.Query("SELECT spawnId, poolSpawnId, chance FROM pool_members WHERE type = 2");
|
||||
|
||||
if (result.IsEmpty())
|
||||
{
|
||||
@@ -343,9 +343,9 @@ namespace Game
|
||||
{
|
||||
uint oldMSTime = Time.GetMSTime();
|
||||
|
||||
SQLResult result = DB.World.Query("SELECT DISTINCT pool_template.entry, pool_pool.pool_id, pool_pool.mother_pool FROM pool_template" +
|
||||
SQLResult result = DB.World.Query("SELECT DISTINCT pool_template.entry, pool_members.spawnId, pool_members.poolSpawnId FROM pool_template" +
|
||||
" LEFT JOIN game_event_pool ON pool_template.entry=game_event_pool.pool_entry" +
|
||||
" LEFT JOIN pool_pool ON pool_template.entry=pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL");
|
||||
" LEFT JOIN pool_members ON pool_members.type = 2 AND pool_template.entry = pool_members.spawnId WHERE game_event_pool.pool_entry IS NULL");
|
||||
|
||||
if (result.IsEmpty())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user