From 9ade5b77ff8a6425e952f6f068feb4980bf7e869 Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Tue, 24 Apr 2018 12:49:00 +0200
Subject: [PATCH] Scripts/BoT: removed unused instance data from Halfus
 Wyrmbreaker and instance script

---
 .../BastionOfTwilight/bastion_of_twilight.h                | 5 ++---
 .../BastionOfTwilight/boss_halfus_wyrmbreaker.cpp          | 5 +----
 .../BastionOfTwilight/instance_bastion_of_twilight.cpp     | 7 -------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
index fae0d16736..d00fb061bc 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -51,7 +51,6 @@ enum BoTDataTypes
     DATA_UNRESPONSIVE_DRAGON_FIRST,
     DATA_UNRESPONSIVE_DRAGON_SECOND,
     DATA_CAST_DRAGON_BUFFS,
-    DATA_DRAGON_TO_BIND,
     DATA_OPEN_ORPHANED_EMERALD_WHELP_CAGE
 };
 
@@ -138,4 +137,4 @@ AI* GetBastionOfTwilightAI(GameObject* go)
     return GetInstanceAI<AI>(go, BoTScriptName);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
index 18e5c057cc..eedc7b7af3 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
@@ -431,7 +431,7 @@ class npc_halfus_enslaved_dragon : public CreatureScript
                         {
                             Position pos = me->GetPosition();
                             me->SetDisableGravity(true);
-                            me->SendSetPlayHoverAnim(true); // TODO: fix unsetting hover on respawn.
+                            me->SendSetPlayHoverAnim(true);
                             me->GetMotionMaster()->MoveTakeoff(0, pos);
                             _events.ScheduleEvent(EVENT_CAST_DEBUFF, Seconds(1) + Milliseconds(750));
                             break;
@@ -484,10 +484,7 @@ class npc_halfus_enslaved_dragon : public CreatureScript
                         }
                         case EVENT_BIND_TO_HALFUS_WILL:
                             if (Creature* halfus = _instance->GetCreature(DATA_HALFUS_WYRMBREAKER))
-                            {
-                                _instance->SetData(DATA_DRAGON_TO_BIND, me->GetEntry());
                                 DoCastSelf(SPELL_BIND_WILL, true);
-                            }
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
index 242a4bdc36..c289b1d9c7 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
@@ -85,7 +85,6 @@ class instance_bastion_of_twilight : public InstanceMapScript
                 LoadObjectData(creatureData, gameobjectData);
                 _unresponsiveDragonEntryFirst = 0;
                 _unresponsiveDragonEntrySecond = 0;
-                _dragonToBindEntry = 0;
                 _deadOrphanedEmeraldWhelps = 0;
                 GenerateHalfusDragonData();
             }
@@ -272,9 +271,6 @@ class instance_bastion_of_twilight : public InstanceMapScript
                             }
                         }
                         break;
-                    case DATA_DRAGON_TO_BIND:
-                        _dragonToBindEntry = data;
-                        break;
                     case DATA_OPEN_ORPHANED_EMERALD_WHELP_CAGE:
                         for (ObjectGuid guid : _halfusEncounterGUIDs)
                             if (Creature* orphanedEmeraldWhelp = instance->GetCreature(guid))
@@ -294,8 +290,6 @@ class instance_bastion_of_twilight : public InstanceMapScript
                         return _unresponsiveDragonEntryFirst;
                     case DATA_UNRESPONSIVE_DRAGON_SECOND:
                         return _unresponsiveDragonEntrySecond;
-                    case DATA_DRAGON_TO_BIND:
-                        return _dragonToBindEntry;
                 }
                 return 0;
             }
@@ -347,7 +341,6 @@ class instance_bastion_of_twilight : public InstanceMapScript
             std::set<uint32> _activeDragonEntries;
             uint32 _unresponsiveDragonEntryFirst;
             uint32 _unresponsiveDragonEntrySecond;
-            uint32 _dragonToBindEntry;
             uint8 _deadOrphanedEmeraldWhelps;
         };