DB/Misc: Fix startup errors

4 files changed, 20 insertions, 6 deletions

diff --git a/sql/updates/world/2013_08_28_05_world_misc.sql b/sql/updates/world/2013_08_28_05_world_misc.sql
new file mode 100644
index 00000000000..066a2dbfc73
--- /dev/null
+++ b/sql/updates/world/2013_08_28_05_world_misc.sql
@@ -0,0 +1,14 @@
+DELETE from `waypoints` where `entry`=31279;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(31279, 1,  6716.76, 3436.7,  682.197, 'Q I''m Not Dead Yet!'),
+(31279, 2,  6724.09, 3433.56, 682.197, 'Q I''m Not Dead Yet!'),
+(31279, 3,  6734.95, 3435.7,  681.87, 'Q I''m Not Dead Yet!'),
+(31279, 4,  6766.36, 3464.42, 673.201, 'Q I''m Not Dead Yet!'),
+(31279, 5,  6782.48, 3478.07, 674.097, 'Q I''m Not Dead Yet!'),
+(31279, 6,  6789.64, 3484.14, 676.423, 'Q I''m Not Dead Yet!'),
+(31279, 7,  6815.31, 3483.01, 685.829, 'Q I''m Not Dead Yet!'),
+(31279, 8,  6875.41, 3479.14, 694.799, 'Q I''m Not Dead Yet!'),
+(31279, 9, 6946.3,  3477.29, 708.832, 'Q I''m Not Dead Yet!'),
+(31279, 10, 6980.65, 3468.12, 710.813, 'Q I''m Not Dead Yet!'),
+(31279, 11, 7008.43, 3458.64, 696.751, 'Q I''m Not Dead Yet!'),
+(31279, 12, 7042.92, 3438.07, 695.543, 'Q I''m Not Dead Yet!');
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index ef55005d0d6..e3717a934c3 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -82,14 +82,14 @@ class InstanceSave
            does not include the members of the group unless they have permanent saves */
         void AddPlayer(Player* player) { TRINITY_GUARD(ACE_Thread_Mutex, _lock); m_playerList.push_back(player); }
         bool RemovePlayer(Player* player)
-        { 
+        {
             _lock.acquire();
             m_playerList.remove(player);
             bool isStillValid = UnloadIfEmpty();
             _lock.release();
 
             //delete here if needed, after releasing the lock
-            if(m_toDelete)
+            if (m_toDelete)
                 delete this;
 
             return isStillValid;
@@ -97,10 +97,10 @@ class InstanceSave
         /* all groups bound to the instance */
         void AddGroup(Group* group) { m_groupList.push_back(group); }
         bool RemoveGroup(Group* group)
-        { 
+        {
             m_groupList.remove(group);
             bool isStillValid = UnloadIfEmpty();
-            if(m_toDelete)
+            if (m_toDelete)
                 delete this;
             return isStillValid;
         }
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index e6e9fffd5ac..30174996a42 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -291,7 +291,7 @@ class npc_annhylde_the_caller : public CreatureScript
             {
                 if (type != POINT_MOTION_TYPE)
                     return;
-    
+
                 switch (id)
                 {
                     case 1:
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index 7bc25aad773..c4e7416f855 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -197,7 +197,7 @@ class instance_utgarde_keep : public InstanceMapScript
 
                 std::ostringstream saveStream;
                 saveStream << "U K " << GetBossSaveData();
-                
+
                 for (uint8 i = 0; i < 3; ++i)
                     saveStream << Forges[i].Event << ' ';