diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 5c59aa9b3..71ebcce73 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -310,7 +310,7 @@ BattleGround::~BattleGround()
         delete itr->second;
 }
 
-void BattleGround::Update(uint32 diff)
+void BattleGround::Update(const uint32 diff)
 {
     if (!GetPlayersSize())
     {
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index 0a7099000..c3ddbfcfa 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -292,7 +292,7 @@ class BattleGround
         BattleGround();
         /*BattleGround(const BattleGround& bg);*/
         virtual ~BattleGround();
-        virtual void Update(uint32 diff);                   // must be implemented in BG subclass of BG specific update code, but must in begginning call parent version
+        virtual void Update(const uint32 diff);             // must be implemented in BG subclass of BG specific update code, but must in begginning call parent version
         virtual bool SetupBattleGround()                    // must be implemented in BG subclass
         {
             return true;
diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGroundAA.cpp
index 8b06b1b88..0b01bd295 100644
--- a/src/game/BattleGroundAA.cpp
+++ b/src/game/BattleGroundAA.cpp
@@ -40,7 +40,7 @@ BattleGroundAA::~BattleGroundAA()
 
 }
 
-void BattleGroundAA::Update(uint32 diff)
+void BattleGroundAA::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 }
diff --git a/src/game/BattleGroundAA.h b/src/game/BattleGroundAA.h
index 66fea2148..207e15267 100644
--- a/src/game/BattleGroundAA.h
+++ b/src/game/BattleGroundAA.h
@@ -35,7 +35,7 @@ class BattleGroundAA : public BattleGround
     public:
         BattleGroundAA();
         ~BattleGroundAA();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
index 2d29f1c5a..ff47b5fa3 100644
--- a/src/game/BattleGroundAB.cpp
+++ b/src/game/BattleGroundAB.cpp
@@ -43,7 +43,7 @@ BattleGroundAB::~BattleGroundAB()
 {
 }
 
-void BattleGroundAB::Update(uint32 diff)
+void BattleGroundAB::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 
diff --git a/src/game/BattleGroundAB.h b/src/game/BattleGroundAB.h
index 4ecdd9526..8cab3acb8 100644
--- a/src/game/BattleGroundAB.h
+++ b/src/game/BattleGroundAB.h
@@ -180,7 +180,7 @@ class BattleGroundAB : public BattleGround
         BattleGroundAB();
         ~BattleGroundAB();
 
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
         void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp
index 8ed4df9c9..d6ef4ea8a 100644
--- a/src/game/BattleGroundAV.cpp
+++ b/src/game/BattleGroundAV.cpp
@@ -232,7 +232,7 @@ void BattleGroundAV::UpdateScore(BattleGroundTeamId team, int32 points )
     UpdateWorldState(((team == BG_TEAM_HORDE) ? BG_AV_Horde_Score : BG_AV_Alliance_Score), m_TeamScores[team]);
 }
 
-void BattleGroundAV::Update(uint32 diff)
+void BattleGroundAV::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
     if (GetStatus() != STATUS_IN_PROGRESS)
diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h
index ce25bbf15..0b21144f8 100644
--- a/src/game/BattleGroundAV.h
+++ b/src/game/BattleGroundAV.h
@@ -305,7 +305,7 @@ class BattleGroundAV : public BattleGround
     public:
         BattleGroundAV();
         ~BattleGroundAV();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp
index 435109960..f957d8b8f 100644
--- a/src/game/BattleGroundBE.cpp
+++ b/src/game/BattleGroundBE.cpp
@@ -42,7 +42,7 @@ BattleGroundBE::~BattleGroundBE()
 
 }
 
-void BattleGroundBE::Update(uint32 diff)
+void BattleGroundBE::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 
diff --git a/src/game/BattleGroundBE.h b/src/game/BattleGroundBE.h
index 8b2cc33df..205ab3050 100644
--- a/src/game/BattleGroundBE.h
+++ b/src/game/BattleGroundBE.h
@@ -34,7 +34,7 @@ class BattleGroundBE : public BattleGround
     public:
         BattleGroundBE();
         ~BattleGroundBE();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundDS.cpp b/src/game/BattleGroundDS.cpp
index e6a298d90..2765c6a8e 100644
--- a/src/game/BattleGroundDS.cpp
+++ b/src/game/BattleGroundDS.cpp
@@ -40,7 +40,7 @@ BattleGroundDS::~BattleGroundDS()
 
 }
 
-void BattleGroundDS::Update(uint32 diff)
+void BattleGroundDS::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 }
diff --git a/src/game/BattleGroundDS.h b/src/game/BattleGroundDS.h
index 003422663..b9948b0fa 100644
--- a/src/game/BattleGroundDS.h
+++ b/src/game/BattleGroundDS.h
@@ -35,7 +35,7 @@ class BattleGroundDS : public BattleGround
     public:
         BattleGroundDS();
         ~BattleGroundDS();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp
index b17635f32..89d397c74 100644
--- a/src/game/BattleGroundEY.cpp
+++ b/src/game/BattleGroundEY.cpp
@@ -48,7 +48,7 @@ BattleGroundEY::~BattleGroundEY()
 {
 }
 
-void BattleGroundEY::Update(uint32 diff)
+void BattleGroundEY::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 
diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h
index 5fbdae64b..68a8bdb3e 100644
--- a/src/game/BattleGroundEY.h
+++ b/src/game/BattleGroundEY.h
@@ -246,7 +246,7 @@ class BattleGroundEY : public BattleGround
     public:
         BattleGroundEY();
         ~BattleGroundEY();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundIC.cpp b/src/game/BattleGroundIC.cpp
index 6548ca741..777366d7f 100644
--- a/src/game/BattleGroundIC.cpp
+++ b/src/game/BattleGroundIC.cpp
@@ -35,7 +35,7 @@ BattleGroundIC::~BattleGroundIC()
 
 }
 
-void BattleGroundIC::Update(uint32 diff)
+void BattleGroundIC::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 }
diff --git a/src/game/BattleGroundIC.h b/src/game/BattleGroundIC.h
index 8a5238865..8b4b7abd9 100644
--- a/src/game/BattleGroundIC.h
+++ b/src/game/BattleGroundIC.h
@@ -35,7 +35,7 @@ class BattleGroundIC : public BattleGround
     public:
         BattleGroundIC();
         ~BattleGroundIC();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index d2c5e86ac..9d22bcdc9 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -1151,7 +1151,7 @@ void BattleGroundMgr::DeleteAllBattleGrounds()
 }
 
 // used to update running battlegrounds, and delete finished ones
-void BattleGroundMgr::Update(uint32 diff)
+void BattleGroundMgr::Update(const uint32 diff)
 {
     // update scheduled queues
     if (!m_QueueUpdateScheduler.empty())
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
index 39d1bcc00..2b1656f0d 100644
--- a/src/game/BattleGroundMgr.h
+++ b/src/game/BattleGroundMgr.h
@@ -187,7 +187,7 @@ class BattleGroundMgr
         /* Construction */
         BattleGroundMgr();
         ~BattleGroundMgr();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* Packet Building */
         void BuildPlayerJoinedBattleGroundPacket(WorldPacket *data, Player *plr);
diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp
index 336dca557..f94e019d3 100644
--- a/src/game/BattleGroundNA.cpp
+++ b/src/game/BattleGroundNA.cpp
@@ -42,7 +42,7 @@ BattleGroundNA::~BattleGroundNA()
 
 }
 
-void BattleGroundNA::Update(uint32 diff)
+void BattleGroundNA::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 
diff --git a/src/game/BattleGroundNA.h b/src/game/BattleGroundNA.h
index cc8cdad56..9bddb4d2e 100644
--- a/src/game/BattleGroundNA.h
+++ b/src/game/BattleGroundNA.h
@@ -35,7 +35,7 @@ class BattleGroundNA : public BattleGround
     public:
         BattleGroundNA();
         ~BattleGroundNA();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundRB.cpp b/src/game/BattleGroundRB.cpp
index a596631fe..286f04611 100644
--- a/src/game/BattleGroundRB.cpp
+++ b/src/game/BattleGroundRB.cpp
@@ -35,7 +35,7 @@ BattleGroundRB::~BattleGroundRB()
 
 }
 
-void BattleGroundRB::Update(uint32 diff)
+void BattleGroundRB::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 }
diff --git a/src/game/BattleGroundRB.h b/src/game/BattleGroundRB.h
index b99ff9c8e..e2c796ca5 100644
--- a/src/game/BattleGroundRB.h
+++ b/src/game/BattleGroundRB.h
@@ -35,7 +35,7 @@ class BattleGroundRB : public BattleGround
     public:
         BattleGroundRB();
         ~BattleGroundRB();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp
index d54a1195e..d3a0ee159 100644
--- a/src/game/BattleGroundRL.cpp
+++ b/src/game/BattleGroundRL.cpp
@@ -42,7 +42,7 @@ BattleGroundRL::~BattleGroundRL()
 
 }
 
-void BattleGroundRL::Update(uint32 diff)
+void BattleGroundRL::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 
diff --git a/src/game/BattleGroundRL.h b/src/game/BattleGroundRL.h
index 8766a5b1e..5e2e3a527 100644
--- a/src/game/BattleGroundRL.h
+++ b/src/game/BattleGroundRL.h
@@ -35,7 +35,7 @@ class BattleGroundRL : public BattleGround
     public:
         BattleGroundRL();
         ~BattleGroundRL();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundRV.cpp b/src/game/BattleGroundRV.cpp
index e54e4dba4..1cd05b75b 100644
--- a/src/game/BattleGroundRV.cpp
+++ b/src/game/BattleGroundRV.cpp
@@ -40,7 +40,7 @@ BattleGroundRV::~BattleGroundRV()
 
 }
 
-void BattleGroundRV::Update(uint32 diff)
+void BattleGroundRV::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 }
diff --git a/src/game/BattleGroundRV.h b/src/game/BattleGroundRV.h
index d53dd23b8..3909c8bac 100644
--- a/src/game/BattleGroundRV.h
+++ b/src/game/BattleGroundRV.h
@@ -35,7 +35,7 @@ class BattleGroundRV : public BattleGround
     public:
         BattleGroundRV();
         ~BattleGroundRV();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp
index f0012cc79..c136e216d 100644
--- a/src/game/BattleGroundSA.cpp
+++ b/src/game/BattleGroundSA.cpp
@@ -35,7 +35,7 @@ BattleGroundSA::~BattleGroundSA()
 
 }
 
-void BattleGroundSA::Update(uint32 diff)
+void BattleGroundSA::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 }
diff --git a/src/game/BattleGroundSA.h b/src/game/BattleGroundSA.h
index 31a3ffac0..4ce9385e2 100644
--- a/src/game/BattleGroundSA.h
+++ b/src/game/BattleGroundSA.h
@@ -35,7 +35,7 @@ class BattleGroundSA : public BattleGround
     public:
         BattleGroundSA();
         ~BattleGroundSA();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp
index 88d25a72a..96fb0356a 100644
--- a/src/game/BattleGroundWS.cpp
+++ b/src/game/BattleGroundWS.cpp
@@ -40,7 +40,7 @@ BattleGroundWS::~BattleGroundWS()
 {
 }
 
-void BattleGroundWS::Update(uint32 diff)
+void BattleGroundWS::Update(const uint32 diff)
 {
     BattleGround::Update(diff);
 
diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h
index 7fe71e060..ef8e7c50f 100644
--- a/src/game/BattleGroundWS.h
+++ b/src/game/BattleGroundWS.h
@@ -101,7 +101,7 @@ class BattleGroundWS : public BattleGround
         /* Construction */
         BattleGroundWS();
         ~BattleGroundWS();
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index ac1cb9af1..37dcd234f 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -404,7 +404,7 @@ uint32 Creature::ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *
     return display_id;
 }
 
-void Creature::Update(uint32 diff)
+void Creature::Update(const uint32 diff)
 {
     if (m_needNotify)
     {
diff --git a/src/game/Creature.h b/src/game/Creature.h
index abef83cc3..1cc2c7435 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -401,7 +401,7 @@ class MANGOS_DLL_SPEC Creature : public Unit
         uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; }
         char const* GetSubName() const { return GetCreatureInfo()->SubName; }
 
-        void Update(uint32 time);                           // overwrite Unit::Update
+        void Update(const uint32 time);                     // overwrite Unit::Update
         void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const;
         uint32 GetEquipmentId() const { return m_equipmentId; }
 
diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index b2d88f95e..6f72b93fd 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -106,7 +106,7 @@ Unit* DynamicObject::GetCaster() const
     return ObjectAccessor::GetUnit(*this, GetCasterGUID());
 }
 
-void DynamicObject::Update(uint32 p_time)
+void DynamicObject::Update(const uint32 p_time)
 {
     // caster can be not in world at time dynamic object update, but dynamic object not yet deleted in Unit destructor
     Unit* caster = GetCaster();
@@ -168,7 +168,7 @@ void DynamicObject::Delay(int32 delaytime)
                     break;
                 }
             }
-            
+
             if (foundAura)
             {
                 ++iter;
@@ -210,4 +210,4 @@ bool DynamicObject::IsFriendlyTo( Unit const* unit ) const
         return owner->IsFriendlyTo(unit);
     else
         return true;
-}
\ No newline at end of file
+}
diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h
index 09076649b..f61e3ee1f 100644
--- a/src/game/DynamicObject.h
+++ b/src/game/DynamicObject.h
@@ -35,7 +35,7 @@ class DynamicObject : public WorldObject
         void RemoveFromWorld();
 
         bool Create(uint32 guidlow, Unit *caster, uint32 spellId, SpellEffectIndex effIndex, float x, float y, float z, int32 duration, float radius);
-        void Update(uint32 p_time);
+        void Update(const uint32 p_time);
         void Delete();
         uint32 GetSpellId() const { return m_spellId; }
         SpellEffectIndex GetEffIndex() const { return m_effIndex; }
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 29bf77260..69ba15634 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -159,7 +159,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa
     return true;
 }
 
-void GameObject::Update(uint32 /*p_time*/)
+void GameObject::Update(const uint32 /*p_time*/)
 {
     if (GetObjectGuid().IsMOTransport())
     {
@@ -454,7 +454,7 @@ void GameObject::AddUniqueUse(Player* player)
         m_firstUser = player->GetObjectGuid();
 
     m_UniqueUsers.insert(player->GetObjectGuid());
-    
+
 }
 
 void GameObject::Delete()
@@ -1636,4 +1636,4 @@ bool GameObject::IsInSkillupList(Player* player) const
 void GameObject::AddToSkillupList(Player* player)
 {
     m_SkillupSet.insert(player->GetObjectGuid());
-}
\ No newline at end of file
+}
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
index f09e74958..1dc18ae41 100644
--- a/src/game/GameObject.h
+++ b/src/game/GameObject.h
@@ -588,7 +588,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
         void RemoveFromWorld();
 
         bool Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint8 animprogress, GOState go_state);
-        void Update(uint32 p_time);
+        void Update(const uint32 p_time);
         GameObjectInfo const* GetGOInfo() const;
 
         bool IsTransport() const;
diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h
index f3e68efcc..989d75099 100644
--- a/src/game/InstanceData.h
+++ b/src/game/InstanceData.h
@@ -48,7 +48,7 @@ class MANGOS_DLL_SPEC InstanceData
         void SaveToDB();
 
         //Called every map update
-        virtual void Update(uint32 /*diff*/) {}
+        virtual void Update(const uint32 /*diff*/) {}
 
         //Used by the map's CanEnter function.
         //This is to prevent players from entering during boss encounters.
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 9e301f983..3cd7fcf43 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -240,7 +240,7 @@ void MapManager::DeleteInstance(uint32 mapid, uint32 instanceId)
 }
 
 void
-MapManager::Update(uint32 diff)
+MapManager::Update(const uint32 diff)
 {
     i_timer.Update(diff);
     if( !i_timer.Passed() )
diff --git a/src/game/MapManager.h b/src/game/MapManager.h
index 11100fd7a..41a70e8d7 100644
--- a/src/game/MapManager.h
+++ b/src/game/MapManager.h
@@ -67,7 +67,7 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
         }
 
         void Initialize(void);
-        void Update(uint32);
+        void Update(const uint32);
 
         void SetGridCleanUpDelay(uint32 t)
         {
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index 37df11753..e2e9d45ae 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -63,7 +63,7 @@ MotionMaster::~MotionMaster()
     DirectClean(false,true);
 }
 
-void MotionMaster::UpdateMotion(uint32 diff)
+void MotionMaster::UpdateMotion(const uint32 diff)
 {
     if (m_owner->hasUnitState(UNIT_STAT_CAN_NOT_MOVE))
         return;
diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h
index 605fdffd0..7d8405d23 100644
--- a/src/game/MotionMaster.h
+++ b/src/game/MotionMaster.h
@@ -78,7 +78,7 @@ class MANGOS_DLL_SPEC MotionMaster : private std::stack<MovementGenerator *>
         const_iterator begin() const { return Impl::c.begin(); }
         const_iterator end() const { return Impl::c.end(); }
 
-        void UpdateMotion(uint32 diff);
+        void UpdateMotion(const uint32 diff);
         void Clear(bool reset = true, bool all = false)
         {
             if (m_cleanFlag & MMCF_UPDATE)
diff --git a/src/game/Object.h b/src/game/Object.h
index 9da8b345f..217519002 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -344,7 +344,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
     public:
         virtual ~WorldObject ( ) {}
 
-        virtual void Update ( uint32 /*time_diff*/ ) { }
+        virtual void Update(const uint32 /*time_diff*/) { }
 
         void _Create( uint32 guidlow, HighGuid guidhigh, uint32 phaseMask);
 
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 400270b98..f1331aac0 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -482,7 +482,7 @@ void Pet::SetDeathState(DeathState s)                       // overwrite virtual
     }
 }
 
-void Pet::Update(uint32 diff)
+void Pet::Update(const uint32 diff)
 {
     if(m_removed)                                           // pet already removed, just wait in remove queue, no updates
         return;
diff --git a/src/game/Pet.h b/src/game/Pet.h
index 15d3a6e8d..57cd8ce0c 100644
--- a/src/game/Pet.h
+++ b/src/game/Pet.h
@@ -157,7 +157,7 @@ class Pet : public Creature
         static void DeleteFromDB(uint32 guidlow);
 
         void SetDeathState(DeathState s);                   // overwrite virtual Creature::SetDeathState and Unit::SetDeathState
-        void Update(uint32 diff);                           // overwrite virtual Creature::Update and Unit::Update
+        void Update(const uint32 diff);                     // overwrite virtual Creature::Update and Unit::Update
 
         uint8 GetPetAutoSpellSize() const { return m_autospells.size(); }
         uint32 GetPetAutoSpellOnPos(uint8 pos) const
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 4fa2ced37..d84198cf9 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1179,7 +1179,7 @@ void Player::SetDrunkValue(uint16 newDrunkenValue, uint32 itemId)
     SendMessageToSet(&data, true);
 }
 
-void Player::Update( uint32 p_time )
+void Player::Update(const uint32 p_time)
 {
     if(!IsInWorld())
         return;
diff --git a/src/game/Player.h b/src/game/Player.h
index 2915d5b23..5c5557865 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1121,7 +1121,7 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         bool Create( uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId );
 
-        void Update( uint32 time );
+        void Update(const uint32 time);
 
         static bool BuildEnumData( QueryResult * result,  WorldPacket * p_data );
 
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index f1fdd64db..2806ee910 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -26,7 +26,7 @@ Creature(CREATURE_SUBTYPE_TEMPORARY_SUMMON), m_type(TEMPSUMMON_TIMED_OR_CORPSE_D
 {
 }
 
-void TemporarySummon::Update( uint32 diff )
+void TemporarySummon::Update(const uint32 diff)
 {
     switch(m_type)
     {
diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h
index 24f8569a1..b02d24e61 100644
--- a/src/game/TemporarySummon.h
+++ b/src/game/TemporarySummon.h
@@ -27,7 +27,7 @@ class TemporarySummon : public Creature
     public:
         explicit TemporarySummon(ObjectGuid summoner = ObjectGuid());
         virtual ~TemporarySummon(){};
-        void Update(uint32 time);
+        void Update(const uint32 time);
         void Summon(TempSummonType type, uint32 lifetime);
         void MANGOS_DLL_SPEC UnSummon();
         void SaveToDB();
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index 87cb0d56c..856013577 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -31,7 +31,7 @@ Totem::Totem() : Creature(CREATURE_SUBTYPE_TOTEM)
     m_type = TOTEM_PASSIVE;
 }
 
-void Totem::Update( uint32 time )
+void Totem::Update(const uint32 time)
 {
     Unit *owner = GetOwner();
     if (!owner || !owner->isAlive() || !isAlive())
diff --git a/src/game/Totem.h b/src/game/Totem.h
index 57c1686c6..2ff067b41 100644
--- a/src/game/Totem.h
+++ b/src/game/Totem.h
@@ -33,7 +33,7 @@ class Totem : public Creature
     public:
         explicit Totem();
         virtual ~Totem(){};
-        void Update( uint32 time );
+        void Update(const uint32 time);
         void Summon(Unit* owner);
         void UnSummon();
         uint32 GetSpell() const { return m_spells[0]; }
diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp
index 0c3431d07..b8c31243e 100644
--- a/src/game/Transports.cpp
+++ b/src/game/Transports.cpp
@@ -487,7 +487,7 @@ bool Transport::RemovePassenger(Player* passenger)
     return true;
 }
 
-void Transport::Update(uint32 /*p_time*/)
+void Transport::Update(const uint32 /*p_time*/)
 {
     if (m_WayPoints.size() <= 1)
         return;
diff --git a/src/game/Transports.h b/src/game/Transports.h
index a7917d69d..3515373c8 100644
--- a/src/game/Transports.h
+++ b/src/game/Transports.h
@@ -32,7 +32,7 @@ class Transport : public GameObject
 
         bool Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint8 animprogress, uint16 dynamicHighValue);
         bool GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids);
-        void Update(uint32 p_time);
+        void Update(const uint32 p_time);
         bool AddPassenger(Player* passenger);
         bool RemovePassenger(Player* passenger);
 
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index bd2b77bcc..0c56fb65a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -291,7 +291,7 @@ Unit::~Unit()
     MANGOS_ASSERT(m_deletedHolders.size() == 0);
 }
 
-void Unit::Update( uint32 p_time )
+void Unit::Update(const uint32 p_time)
 {
     if(!IsInWorld())
         return;
diff --git a/src/game/Unit.h b/src/game/Unit.h
index def113fbe..07966b028 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1162,7 +1162,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void ApplyDiminishingAura(DiminishingGroup  group, bool apply);
         void ClearDiminishings() { m_Diminishing.clear(); }
 
-        virtual void Update( uint32 time );
+        virtual void Update(const uint32 time);
 
         void setAttackTimer(WeaponAttackType type, uint32 time) { m_attackTimer[type] = time; }
         void resetAttackTimer(WeaponAttackType type = BASE_ATTACK);
diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index 21db9ab8b..93412c6cd 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -56,7 +56,7 @@ void Vehicle::SetDeathState(DeathState s)                       // overwrite vir
     Creature::SetDeathState(s);
 }
 
-void Vehicle::Update(uint32 diff)
+void Vehicle::Update(const uint32 diff)
 {
     Creature::Update(diff);
 }
diff --git a/src/game/World.cpp b/src/game/World.cpp
index cb92a8d6b..f80918c5e 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1373,7 +1373,7 @@ void World::DetectDBCLang()
 }
 
 /// Update the World !
-void World::Update(uint32 diff)
+void World::Update(const uint32 diff)
 {
     ///- Update the different timers
     for(int i = 0; i < WUPDATE_COUNT; ++i)
@@ -1857,7 +1857,7 @@ void World::SendServerMessage(ServerMessageType type, const char *text, Player*
         SendGlobalMessage( &data );
 }
 
-void World::UpdateSessions( uint32 diff )
+void World::UpdateSessions(const uint32 diff)
 {
     ///- Add new sessions
     WorldSession* sess;
diff --git a/src/game/World.h b/src/game/World.h
index 3d10f2148..4859a697b 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -509,7 +509,7 @@ class World
         static void StopNow(uint8 exitcode) { m_stopEvent = true; m_ExitCode = exitcode; }
         static bool IsStopped() { return m_stopEvent; }
 
-        void Update(uint32 diff);
+        void Update(const uint32 diff);
 
         void UpdateSessions( uint32 diff );
 
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index f5fa93759..388f24f4d 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -158,7 +158,7 @@ void WorldSession::LogUnprocessedTail(WorldPacket *packet)
 }
 
 /// Update the WorldSession (triggered by World update)
-bool WorldSession::Update(uint32 /*diff*/)
+bool WorldSession::Update(const uint32 /*diff*/)
 {
     ///- Retrieve packets from the receive queue and call the appropriate handlers
     /// not proccess packets if socket already closed
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5ba78b79d..aab3d3f05 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10610"
+ #define REVISION_NR "10611"
 #endif // __REVISION_NR_H__