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
+    {

Langerz82

diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 0fb99e63d9..9ae272d017 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -787,7 +787,7 @@ void SmartAI::SetCombatMove(bool on)
         }
         else if (MovementGenerator* movement = me->GetMotionMaster()->GetMovementGenerator([](MovementGenerator const* a) -> bool
         {
-            return a->GetMovementGeneratorType() == CHASE_MOTION_TYPE && a->Mode == MOTION_MODE_DEFAULT && a->Priority == MOTION_PRIORITY_NORMAL;
+            return a->GetMovementGeneratorType() == CHASE_MOTION_TYPE && a->Mode == MOTION_MODE_OVERRIDE && a->Priority == MOTION_PRIORITY_NORMAL;

Langerz82

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 1dd66d7699..8683884b25 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -350,6 +350,40 @@ void CreatureAI::SetBoundary(CreatureBoundary const* boundary, bool negateBounda
     me->DoImmediateBoundaryCheck();
 }
 
+bool CreatureAI::CheckMeleeRepositionRequirements()
+{

Langerz82

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 09f5ef01a5..1d8ccf5aec 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -287,6 +287,7 @@ bool DispelableAura::RollDispel() const
     return roll_chance_i(_chance);
 }
 
+
 Unit::Unit(bool isWorldObject) :

Langerz82

/*
 * Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2 of the License, or (at your
 * option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but WITHOUT

Langerz82

/*
 * Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2 of the License, or (at your
 * option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but WITHOUT