Skip to content

Instantly share code, notes, and snippets.

View Langerz82's full-sized avatar

Joshua L Langerz82

View GitHub Profile
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),
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);
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
+ {
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;
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()
+{
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) :
/*
* 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
/*
* 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
uint32 testChars;
const uint32 numTests = 1024;
ByteBuffer buff[numTests];
ByteBuffer buffOld[numTests];
ByteBufferNew buffNew[numTests];
for (int n = 0; n < 20; ++n)
{
for (int m = 0; m < numTests; ++m)
{
uint32 testChars;
const uint32 numTests = 1024;
ByteBuffer buff[numTests];
ByteBuffer buffOld[numTests];
ByteBufferNew buffNew[numTests];
for (int n = 0; n < 20; ++n)
{
for (int m = 0; m < numTests; ++m)
{