Langerz82

diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index a831649589..4ee107eb3e 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -609,6 +609,11 @@ void SmartAI::SpellHit(Unit* unit, SpellInfo const* spellInfo)
 {
     GetScript()->ProcessEventsFor(SMART_EVENT_SPELLHIT, unit, 0, 0, false, spellInfo);
 }
+void SmartAI::SpellHit(GameObject* caster, SpellInfo const* spellInfo)
+{

Langerz82

diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index a831649589..e921922b24 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -996,7 +996,8 @@ void SmartGameObjectAI::UpdateAI(uint32 diff)
 void SmartGameObjectAI::InitializeAI()
 {
     GetScript()->OnInitialize(me);
-    //Reset();
+

Langerz82

diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 20a93451c9..06c490ad31 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -257,7 +257,6 @@ void PetAI::UpdateAI(uint32 diff)
     me->UpdateSpeed(MOVE_RUN);
     me->UpdateSpeed(MOVE_WALK);
     me->UpdateSpeed(MOVE_FLIGHT);
-
 }

Langerz82

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 0acd39162c..5ed939d4bd 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -448,8 +448,11 @@ void Unit::Update(uint32 p_time)
         ModifyAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, HealthAbovePct(75));
     }
 
-    UpdateSplineMovement(p_time);
-    i_motionMaster->Update(p_time);

Langerz82

diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 30f7a56daf..96006ffa38 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -810,6 +810,27 @@ void Battleground::EndBattleground(uint32 winner)
         player->SendDirectMessage(&data);
         player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND, player->GetMapId());
     }
+
+    Player* aPlayer = _GetPlayerForTeam(ALLIANCE, m_Players.begin(), "EndBattleground");

Langerz82

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index a9a9c78c0b..1dd69d093f 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1434,7 +1434,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
             if (canSwim)
                 max_z = GetMapWaterOrGroundLevel(x, y, z, &ground_z);
             else
-                max_z = ground_z = GetMapHeight(x, y, z);
+                max_z = ground_z = GetMapHeight(x, y, z, true, DEFAULT_HEIGHT_SEARCH, GetDistance2d(x, y)/2.0f);

Langerz82

diff --git AL-Game/data/static_data/npcs/npc_templates.xml AL-Game/data/static_data/npcs/npc_templates.xml
index cec0fd5..9db7bae 100644
--- AL-Game/data/static_data/npcs/npc_templates.xml
+++ AL-Game/data/static_data/npcs/npc_templates.xml
@@ -61693,31 +61693,31 @@
         </stats>
         <bound_radius front="1.05" side="0.55" upper="0.98"/>
     </npc_template>
-    <npc_template npc_id="210138" level="10" name="Starving Worg" name_id="300115" name_desc="Zaif_10_An" height="1.07" rank="DISCIPLINED" rating="NORMAL" race="BEAST" tribe="ZAIF" ai="general" srange="7" arange="2" adelay="1938" arate="1000" hpgauge="3">
+    <npc_template npc_id="210138" level="10" name="Starving Worg" name_id="300115" name_desc="Zaif_10_An" height="1.07" rank="DISCIPLINED" rating="NORMAL" race="BEAST" tribe="ZAIF" ai="aggressive" srange="7" arange="2" adelay="1938" arate="1000" hpgauge="3">

Langerz82

diff --git AL-Game/src/com/aionemu/gameserver/model/DialogPage.java AL-Game/src/com/aionemu/gameserver/model/DialogPage.java
index 4d0c59e..5d6f624 100644
--- AL-Game/src/com/aionemu/gameserver/model/DialogPage.java
+++ AL-Game/src/com/aionemu/gameserver/model/DialogPage.java
@@ -35,6 +35,7 @@ public enum DialogPage {
 	SELECT_QUEST_REWARD_WINDOW8(48),
 	SELECT_QUEST_REWARD_WINDOW9(49),
 	SELECT_QUEST_REWARD_WINDOW10(50),
+	SELECT_QUEST_REWARD_WINDOW11(51),
 	VENDOR(DialogAction.OPEN_VENDOR, 13),

Langerz82

diff --git AL-Game/src/com/aionemu/gameserver/model/gameobjects/player/Equipment.java AL-Game/src/com/aionemu/gameserver/model/gameobjects/player/Equipment.java
index 36dc026..2b3c5a6 100644
--- AL-Game/src/com/aionemu/gameserver/model/gameobjects/player/Equipment.java
+++ AL-Game/src/com/aionemu/gameserver/model/gameobjects/player/Equipment.java
@@ -1326,7 +1326,7 @@ public class Equipment {
 						ItemPacketService.updateItemAfterInfoChange(owner, item);
 
 						equip(slot, item);
-						PacketSendUtility.broadcastPacket(player, new SM_UPDATE_PLAYER_APPEARANCE(player.getObjectId(), getEquippedForApparence()), true);
+						PacketSendUtility.broadcastPacket(player, new SM_UPDATE_PLAYER_APPEARANCE(player, getEquippedForApparence()), true);

Langerz82

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 1dd66d7699..5ed1f4e232 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -40,6 +40,11 @@ void CreatureAI::OnCharmed(bool apply)
         me->NeedChangeAI = true;
         me->IsAIEnabled = false;
     }
+    else
+    {