From c93e0fdcd089902cf4a9b5fa7bdc4366622a9973 Mon Sep 17 00:00:00 2001 From: Caydan Date: Sun, 28 Jan 2018 18:22:07 +0100 Subject: [PATCH] Core/BattleGrounds: Changed upper case character in tables character_Battleground_data and Battleground_template to lower case to solve startup issues (#17) --- Source/Game/BattleGrounds/BattleGroundManager.cs | 2 +- Source/Game/Events/GameEventManager.cs | 6 +++--- Source/Game/Globals/ObjectManager.cs | 2 +- Source/WorldServer/Server.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Game/BattleGrounds/BattleGroundManager.cs b/Source/Game/BattleGrounds/BattleGroundManager.cs index 0fff7c6ac..e70e9d176 100644 --- a/Source/Game/BattleGrounds/BattleGroundManager.cs +++ b/Source/Game/BattleGrounds/BattleGroundManager.cs @@ -399,7 +399,7 @@ namespace Game.BattleGrounds _BattlegroundTemplates.Clear(); // 0 1 2 3 4 5 6 7 8 9 - SQLResult result = DB.World.Query("SELECT ID, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, HordeStartLoc, StartMaxDist, Weight, ScriptName FROM Battleground_template"); + SQLResult result = DB.World.Query("SELECT ID, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, HordeStartLoc, StartMaxDist, Weight, ScriptName FROM battleground_template"); if (result.IsEmpty()) { Log.outError(LogFilter.ServerLoading, "Loaded 0 Battlegrounds. DB table `Battleground_template` is empty."); diff --git a/Source/Game/Events/GameEventManager.cs b/Source/Game/Events/GameEventManager.cs index 935948fa8..719c78321 100644 --- a/Source/Game/Events/GameEventManager.cs +++ b/Source/Game/Events/GameEventManager.cs @@ -821,10 +821,10 @@ namespace Game uint oldMSTime = Time.GetMSTime(); // 0 1 - SQLResult result = DB.World.Query("SELECT eventEntry, bgflag FROM game_event_Battleground_holiday"); + SQLResult result = DB.World.Query("SELECT eventEntry, bgflag FROM game_event_battleground_holiday"); if (result.IsEmpty()) - Log.outInfo(LogFilter.ServerLoading, "Loaded 0 Battlegroundholidays in game events. DB table `game_event_Battleground_holiday` is empty."); + Log.outInfo(LogFilter.ServerLoading, "Loaded 0 Battlegroundholidays in game events. DB table `game_event_battleground_holiday` is empty."); else { uint count = 0; @@ -834,7 +834,7 @@ namespace Game if (event_id >= mGameEvent.Length) { - Log.outError(LogFilter.Sql, "`game_event_Battleground_holiday` game event id ({0}) not exist in `game_event`", event_id); + Log.outError(LogFilter.Sql, "`game_event_battleground_holiday` game event id ({0}) not exist in `game_event`", event_id); continue; } diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index f67e5faad..f2514b666 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -1039,7 +1039,7 @@ namespace Game scriptNamesStorage.Add(""); SQLResult result = DB.World.Query( - "SELECT DISTINCT(ScriptName) FROM Battleground_template WHERE ScriptName <> '' " + + "SELECT DISTINCT(ScriptName) FROM battleground_template WHERE ScriptName <> '' " + "UNION SELECT DISTINCT(ScriptName) FROM conversation_template WHERE ScriptName <> '' " + "UNION SELECT DISTINCT(ScriptName) FROM creature WHERE ScriptName <> '' " + "UNION SELECT DISTINCT(ScriptName) FROM creature_template WHERE ScriptName <> '' " + diff --git a/Source/WorldServer/Server.cs b/Source/WorldServer/Server.cs index 38a620ccf..0fc5863c6 100644 --- a/Source/WorldServer/Server.cs +++ b/Source/WorldServer/Server.cs @@ -152,7 +152,7 @@ namespace WorldServer DB.Characters.Execute("UPDATE characters SET online = 0 WHERE online <> 0"); // Battlegroundinstance ids reset at server restart - DB.Characters.Execute("UPDATE character_Battleground_data SET instanceId = 0"); + DB.Characters.Execute("UPDATE character_battleground_data SET instanceId = 0"); } static void WorldUpdateLoop()