errors.diff

diff --cc src/server/game/Entities/Creature/Creature.h
index 16fa03b,1db3f41..0000000
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@@ -78,12 -80,12 +80,12 @@@ struct CreatureTemplat
      uint32  Entry;
      uint32  DifficultyEntry[MAX_DIFFICULTY - 1];
      uint32  KillCredit[MAX_KILL_CREDIT];
 -    uint32  Modelid1;
 -    uint32  Modelid2;
 -    uint32  Modelid3;
 -    uint32  Modelid4;
 +    int32  Modelid1;
 +    int32  Modelid2;
 +    int32  Modelid3;
 +    int32  Modelid4;
      std::string  Name;
-     std::string  SubName;
+     std::string  Title;
      std::string  IconName;
      uint32  GossipMenuId;
      uint8   minlevel;
@@@ -135,8 -137,10 +137,15 @@@
      uint32  MechanicImmuneMask;
      uint32  flags_extra;
      uint32  ScriptID;
++<<<<<<< HEAD
 +    int32  GetRandomValidModelId() const;
 +    int32  GetFirstValidModelId() const;
++=======
+     uint32  GetRandomValidModelId() const;
+     uint32  GetFirstValidModelId() const;
+     uint32  GetFirstInvisibleModel() const;
+     uint32  GetFirstVisibleModel() const;
++>>>>>>> e429567b539fd4b0740a996018af08084dba2a08

      // helpers
      SkillType GetRequiredLootSkill() const
@@@ -744,8 -750,8 +758,9 @@@ class Creature : public Unit, public Gr
          bool TriggerJustRespawned;

          Spell const* _focusSpell;   ///> Locks the target during spell cast for proper facing
+         uint32 _focusDelay;

 +        int32 outfitId;
          CreatureTextRepeatGroup m_textRepeat;
  };

diff --cc src/server/game/Entities/Unit/Unit.cpp
index 2a5dcd3,a2a3151..0000000
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@@ -17791,22 -17791,8 +17809,25 @@@ void Unit::BuildValuesUpdate(uint8 upda
                                  }

                      if (cinfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER)
-                     {
                          if (target->IsGameMaster())
++<<<<<<< HEAD
 +                        {
 +                            if (uint32 modelid = sObjectMgr->GetCreatureDisplay(cinfo->Modelid1))
 +                                displayId = modelid;            // Modelid1 is a visible model for gms
 +                            else
 +                                displayId = 17519;              // world visible trigger's model
 +                        }
 +                        else
 +                        {
 +                            if (uint32 modelid = sObjectMgr->GetCreatureDisplay(cinfo->Modelid2))
 +                                displayId = modelid;            // Modelid2 is an invisible model for players
 +                            else
 +                                displayId = 11686;              // world invisible trigger's model
 +                        }
 +                    }
++=======
+                             displayId = cinfo->GetFirstVisibleModel();
++>>>>>>> e429567b539fd4b0740a996018af08084dba2a08
                  }

                  fieldBuffer << uint32(displayId);
diff --cc src/server/game/Maps/Map.cpp
index 5f9af54,ccc599b..0000000
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@@ -35,12 -35,9 +35,12 @@@
  #include "Transport.h"
  #include "Vehicle.h"
  #include "VMapFactory.h"
 +#ifdef ELUNA
 +#include "LuaEngine.h"
 +#endif

  u_map_magic MapMagic        = { {'M','A','P','S'} };
- u_map_magic MapVersionMagic = { {'v','1','.','3'} };
+ u_map_magic MapVersionMagic = { {'v','1','.','8'} };
  u_map_magic MapAreaMagic    = { {'A','R','E','A'} };
  u_map_magic MapHeightMagic  = { {'M','H','G','T'} };
  u_map_magic MapLiquidMagic  = { {'M','L','I','Q'} };
@@@ -3169,7 -3233,7 +3258,11 @@@ void InstanceMap::CreateInstanceData(bo
              i_data->SetCompletedEncountersMask(fields[1].GetUInt32());
              if (!data.empty())
              {
++<<<<<<< HEAD
 +                TC_LOG_DEBUG("maps", "Loading instance data for `%s` with id %u", isElunaAI ? "ElunaAI" : sObjectMgr->GetScriptName(i_script_id), i_InstanceId);
++=======
+                 TC_LOG_DEBUG("maps", "Loading instance data for `%s` with id %u", sObjectMgr->GetScriptName(i_script_id).c_str(), i_InstanceId);
++>>>>>>> e429567b539fd4b0740a996018af08084dba2a08
                  i_data->Load(data.c_str());
              }
          }
diff --cc src/server/game/Scripting/ScriptMgr.cpp
index 9bcb62e,4b26ba9..0000000
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@@ -1557,12 -1355,9 +1609,16 @@@ void ScriptMgr::OnPlayerSave(Player* pl
      FOREACH_SCRIPT(PlayerScript)->OnSave(player);
  }

- void ScriptMgr::OnPlayerBindToInstance(Player* player, Difficulty difficulty, uint32 mapid, bool permanent)
+ void ScriptMgr::OnPlayerBindToInstance(Player* player, Difficulty difficulty, uint32 mapid, bool permanent, uint8 extendState)
  {
++<<<<<<< HEAD
 +#ifdef ELUNA
 +    sEluna->OnBindToInstance(player, difficulty, mapid, permanent);
 +#endif
 +    FOREACH_SCRIPT(PlayerScript)->OnBindToInstance(player, difficulty, mapid, permanent);
++=======
+     FOREACH_SCRIPT(PlayerScript)->OnBindToInstance(player, difficulty, mapid, permanent, extendState);
++>>>>>>> e429567b539fd4b0740a996018af08084dba2a08
  }

  void ScriptMgr::OnPlayerUpdateZone(Player* player, uint32 newZone, uint32 newArea)