Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Battlefield/Zones/BattlefieldWG.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/azshara.cpp

2 files changed, 7 insertions, 38 deletions

diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index a950a74e59c..4727504a4bd 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -553,6 +553,12 @@ class boss_professor_putricide : public CreatureScript
                 return 0;
             }
 
+            void SetData(uint32 id, uint32 data)
+            {
+                if (id == DATA_EXPERIMENT_STAGE)
+                    _experimentState = bool(data);
+            }
+
             void UpdateAI(uint32 const diff)
             {
                 if ((!(events.GetPhaseMask() & PHASE_MASK_NOT_SELF) && !UpdateVictim()) || !CheckInRoom())
@@ -1007,7 +1013,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader
                 Creature* creature = GetCaster()->ToCreature();
 
                 uint32 stage = creature->AI()->GetData(DATA_EXPERIMENT_STAGE);
-                creature->AI()->SetData(DATA_EXPERIMENT_STAGE, !stage);
+                creature->AI()->SetData(DATA_EXPERIMENT_STAGE, stage ^ true);
 
                 Creature* target = NULL;
                 std::list<Creature*> creList;
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 6eed82991b8..bbc26de85eb 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -29,7 +29,6 @@ npc_corastrasza
 npc_jenny
 npc_sinkhole_kill_credit
 npc_khunok_the_behemoth
-npc_scourge_prisoner
 mob_nerubar_victim
 npc_keristrasza
 npc_nesingwary_trapper
@@ -387,41 +386,6 @@ public:
 };
 
 /*######
-## npc_scourge_prisoner
-######*/
-
-enum eScourgePrisoner
-{
-    GO_SCOURGE_CAGE = 187867
-};
-
-class npc_scourge_prisoner : public CreatureScript
-{
-public:
-    npc_scourge_prisoner() : CreatureScript("npc_scourge_prisoner") { }
-
-    struct npc_scourge_prisonerAI : public ScriptedAI
-    {
-        npc_scourge_prisonerAI(Creature* creature) : ScriptedAI (creature){}
-
-        void Reset()
-        {
-            me->SetReactState(REACT_PASSIVE);
-
-            if (GameObject* go = me->FindNearestGameObject(GO_SCOURGE_CAGE, 5.0f))
-                if (go->GetGoState() == GO_STATE_ACTIVE)
-                    go->SetGoState(GO_STATE_READY);
-        }
-
-    };
-
-    CreatureAI* GetAI(Creature* creature) const
-    {
-        return new npc_scourge_prisonerAI(creature);
-    }
-};
-
-/*######
 ## npc_jenny
 ######*/
 
@@ -2548,7 +2512,6 @@ void AddSC_borean_tundra()
     new npc_corastrasza();
     new npc_iruk();
     new mob_nerubar_victim();
-    new npc_scourge_prisoner();
     new npc_jenny();
     new npc_fezzix_geartwist();
     new npc_nesingwary_trapper();