Changeset 1207

Timestamp:

03/07/2010 10:47:08 AM (6 months ago)

Author:

Paroxysm

Message:

FIXED :

• Crashes related to invalid references being used.
  
• GetRandomEnemy/Friend? should function correctly.
  
• LCF:RegisterLuaEvent shouldn't treat repeats as unlimited.
  

ADDED :

• Unit/GameObject:GetObject(guid)
  
• LCF_Creature/Player/GameObject:GetLocalCreature/GameObject(entry).
  
• LCF_Creature/GameObject:GetCreator(target)/SetCreator()
  
  
• Extracted a dump of all functions each wow object has, none of the functions are documented though, it's just a list.
  

** Began rewrite of those shitty scripts in /lua folder.

Location:

Trunk

Files:

• LUA_ENGINE_COMMANDS.txt (modified) (3 diffs)
• WOWOBJECTFUNCTIONSDUMP.txt (added)
• lua/BOSS_ManaTombs_Pandemonius.lua (deleted)
• lua/BOSS_ManaTombs_Shaffar.lua (deleted)
• lua/BOSS_ManaTombs_Tavarok.lua (deleted)
• lua/BOSS_ManaTombs_Yor.lua (deleted)
• lua/MANA_TOMBS (added)
• lua/MANA_TOMBS/Instance_ManaTombs.lua (added)
• lua/MANA_TOMBS/Pandemonius.script (added)
• lua/MANA_TOMBS/shaffar.script (added)
• lua/MANA_TOMBS/tavarok.script (added)
• lua/MANA_TOMBS/yor.script (added)
• lua/Misc/0LCF_Includes/LCF_Creature.lua (modified) (3 diffs)
• lua/Misc/0LCF_Includes/LCF_Extra.lua (modified) (2 diffs)
• lua/Misc/0LCF_Includes/LCF_Gameobject.lua (modified) (1 diff)
• lua/Misc/0LCF_Includes/LCF_Player.lua (modified) (1 diff)
• src/LuaEngine/FunctionTables.h (modified) (2 diffs)
• src/LuaEngine/GameobjectFunctions.h (modified) (1 diff)
• src/LuaEngine/LUAEngine.cpp (modified) (17 diffs)
• src/LuaEngine/UnitFunctions.h (modified) (11 diffs)

Trunk/LUA_ENGINE_COMMANDS.txt

@@ -461 +461 @@
                 - Note : if you want to register a Lua METHOD, then you will have to pass in LCF:BindMethod(method_name,methods_table) for func. method being the lua function and methods_table being the TABLE, method is located in. This goes for the other classes as well.
         RemoveLuaEvent(func) -- removes all events currently registered under the invoking player. Specify func to remove only those events who invoke func.
-        FaceUnit(tar) - makes the Creature face the target specified.
-        GetNearestUnitWithEntry(entry) - returns the nearest unit to the creature with the specified entry.
+        FaceUnit(tar) - makes the Creature face the target specified.
+    GetNearestUnitWithEntry(entry) - returns the nearest unit to the creature with the specified entry.
+        GetLocalCreature(creature_entry) - simply calls GetCreatureNearestCoords with the unit's position.
+        GetLocalGameObject(go_entry)
+        GetCreator() - returns the unit whos guid is stored in UNIT_FIELD_CREATEDBY/SUMMONEDBY
+        SetCreator(creator_obj) - sets UNIT_FIELD_CREATEDBY/SUMMONEDBY to creator_obj:GetGUID()
  Player:
         GetStrength()
@@ -475 +479 @@
         RegisterLuaEvent(func,delay,repeats,extra_args_go_here) - same as creature
         RemoveLuaEvent(func) -- same as creature
-        GetNearestUnitWithEntry(entry) - same as creature
+    GetNearestUnitWithEntry(entry) - same as creature
+        GetLocalCreature(creature_entry) - simply calls GetCreatureNearestCoords with the player's position.
+        GetLocalGameObject(go_entry)
  GameObject:
         SetClickable()
@@ -488 +494 @@
         RegisterLuaEvent(func,delay,repeats,extra_args_go_here) - same as creature.
         RemoveLuaEvent(func) - same as creature
+        GetCreator() - returns the unit whos guid is stored in OBJECT_FIELD_CREATEDBY
+        SetCreator(creator_obj) - sets OBJECT_FIELD_CREATEDBY to creator_obj:GetGUID()
+        GetLocalCreature(creature_entry) - simply calls GetCreatureNearestCoords with the go's position.
+        GetLocalGameObject(go_entry)
 EXTRA METHODS
         LCF:RegisterZoneHook(zone_id,func) - this takes the desired zone id and a lua function value(not a string unlike RegisterUnitEvent...) It will then call this function when the server hook with the zone id triggers

Trunk/lua/Misc/0LCF_Includes/LCF_Creature.lua

@@ -20 +20 @@
 local CREATURE = LCF.CreatureMethods
 assert(CREATURE)
+--[[CREATURE.spell_events = {}
+CREATURE.CAST_FLAG_ON_SELF =  0x0
+CREATURE.CAST_FLAG_ON_TARGET = 0x1
+CREATURE.CAST_FLAG_DEST = 0x2
+CREATURE.CAST_FLAG_ALL_PLAYERS = 0x3
+CREATURE.CAST_FLAG_FRIENDLY_UNITS = 0x4
+CREATURE.CAST_FLAG_ENEMY_UNITS = 0x5
+CREATURE.CAST_ATTRIBUTE_INSTANT = 0x8 -- or 1000B]]
 
 function CREATURE:SetUnselectable()
@@ -68 +76 @@
         self:SendChatMessage(LCF.CHAT_MSG_MONSTER_EMOTE,LCF.LANG_UNIVERSAL,msg)
 end
+function CREATURE:MonsterWhisper(msg)
+        self:SendChatMessage(LCF.CHAT_MSG_MONSTER_WHISPER,LCF.LANG_UNIVERSAL,msg)
+end
 function CREATURE:MoveToUnit(target)
         local x,y,z = target:GetLocation()
@@ -82 +93 @@
         LCF:RemoveLuaEvent(tostring(self),func)
 end
-function CREATURE:GetNearestUnitWithEntry(entry)
-   return (self:GetCreatureNearestCoords(entry, self:GetX(), self:GetY(), self:GetZ(), self:GetO()))
+function CREATURE:IsCasting()
+        return self:GetCurrentSpell() ~= nil
 end
-function CREATURE:FaceUnit(tar)
-   if (type(tar) == "userdata" and tar:GetObjectType() == "Unit")
-      self:SetFacing(self:CalcRadAngle(self:GetX(), self:GetY(), tar:GetX(), tar:GetY()))
-      return true
-   else
-      return nil
-   end
+function CREATURE:SetCreator(creator)
+        self:SetUInt64Value(LCF.UNIT_FIELD_CREATEDBY,creator:GetGUID())
 end
+function CREATURE:GetCreator()
+        local creator_guid = self:GetUInt64Value(LCF.UNIT_FIELD_CREATEDBY)
+        if(creator_guid == nil) then
+                creator_guid = self:GetUInt64Value(LCF.UNIT_FIELD_SUMMONEDBY)
+        end
+        return self:GetObject(creator_guid)
+end
+function CREATURE:GetLocalCreature(entry)
+        local x,y,z = self:GetLocation()
+        local crc = self:GetCreatureNearestCoords(x,y,z,entry)
+        return crc
+end
+function CREATURE:GetLocalGameObject(entry)
+        local x,y,z = self:GetLocation()
+        local go = self:GetGameObjectNearestCoords(x,y,z,entry)
+        return go
+end

Trunk/lua/Misc/0LCF_Includes/LCF_Extra.lua

@@ -110 +110 @@
         if(type(delay) ~= "number") then error("Invalid argument #2, expected number got ->"..type(delay)) end
         if(type(repeats) ~= "number") then error("Invalid argument #3, expected number got->"..type(repeats)) end
-        assert(type(arg) == "table","Interval error, arg is not a table.")
+        assert(type(arg) == "table","Internal error, arg is not a table.")
         if(delay <= 0) then error("Invalid argument #2, delay must be greater than 0.") end
-        local struct = {evt_typ,{func,delay,interval,repeats,arg} }
+        local struct = {evt_typ,{func,delay,repeats,repeats,arg} }
         table.insert(self.call_backs,struct)
 end
@@ -149 +149 @@
         return function(...) return method(method_table,unpack(arg)) end
 end
-        
-        
-RegisterServerHook(15,"LCF:HandleOnZone")
-RegisterServerHook(26,"LCF:HandleOnAreaTrigger")
+RegisterServerHook(15,LCF:BindMethod(LCF.HandleOnZone,LCF))
+RegisterServerHook(26,LCF:BindMethod(LCF.HandleOnAreaTrigger,LCF))
 RegisterTimedEvent("LCF:UpdateCallBacks",100,0)

Trunk/lua/Misc/0LCF_Includes/LCF_Gameobject.lua

@@ -62 +62 @@
         LCF:RemoveLuaEvent(tostring(self),func)
 end
+function GAMEOBJECT:SetCreator(creator)
+        local guid = creator:GetGUID()
+        self:SetUInt64Value(LCF.OBJECT_FIELD_CREATED_BY,guid)
+end
+function GAMEOBJECT:GetCreator()
+        local guid = self:GetUInt64Value(LCF.OBJECT_FIELD_CREATED_BY)
+        return self:GetObject(guid)
+end
+function GAMEOBJECT:GetLocalCreature(entry)
+        local x,y,z = self:GetLocation()
+        local crc = self:GetCreatureNearestCoords(x,y,z,entry)
+        return crc
+end
+function GAMEOBJECT:GetLocalGameObject(entry)
+        local x,y,z = self:GetLocation()
+        local go = self:GetGameObjectNearestCoords(x,y,z,entry)
+        return go
+end
+function GAMEOBJECT:GetCreator()
+        local creator_guid = self:GetUInt64Value(LCF.UNIT_FIELD_CREATEDBY)
+        if(creator_guid == nil) then
+                creator_guid = self:GetUInt64Value(LCF.UNIT_FIELD_SUMMONEDBY)
+        end
+        return self:GetObject(creator_guid)
+end

Trunk/lua/Misc/0LCF_Includes/LCF_Player.lua

@@ -66 +66 @@
         LCF:RemoveLuaEvent(tostring(self),func)
 end
-function PLAYER:GetNearestUnitWithEntry(entry)
-   return (self:GetCreatureNearestCoords(entry, self:GetX(), self:GetY(), self:GetZ(), self:GetO()))
+function PLAYER:IsCasting()
+        return player:GetCurrentSpell() ~= nil
 end
+function PLAYER:GetLocalCreature(entry)
+        local x,y,z = self:GetLocation()
+        local crc = self:GetCreatureNearestCoords(x,y,z,entry)
+        return crc
+end
+function PLAYER:GetLocalGameObject(entry)
+        local x,y,z = self:GetLocation()
+        local go = self:GetGameObjectNearestCoords(x,y,z,entry)
+        return go
+end

Trunk/src/LuaEngine/FunctionTables.h

@@ -524 +524 @@
         { "GetSpawnLocation", &luaUnit::GetSpawnLocation },
         { "GetPlayerMovementFlags", &luaUnit::GetPlayerMovementFlags},
+        { "GetObject", &luaUnit::GetObject },
         { NULL, NULL },
 };
@@ -623 +624 @@
         { "GetLocation", &luaGameObject::GetLocation },
         { "GetSpawnLocation", &luaGameObject::GetSpawnLocation },
+        { "GetObject", &luaGameObject::GetObject },
         { NULL, NULL },
 };

Trunk/src/LuaEngine/GameobjectFunctions.h

@@ -1073 +1073 @@
                 return 4;
         }
+        int GetObject(lua_State * L, GameObject * ptr)
+        {
+                TEST_GO();
+                uint64 guid = CHECK_GUID(L,1);
+                Object * obj = ptr->GetMapMgr()->_GetObject(guid);
+                if(obj != NULL && obj->IsUnit() )
+                        PUSH_UNIT(L,obj);
+                else if(obj != NULL && obj->IsGameObject() )
+                        PUSH_GO(L,obj);
+                else
+                        lua_pushnil(L);
+                return 1;
+        }
 }
 #endif

Trunk/src/LuaEngine/LUAEngine.cpp

@@ -236 +236 @@
 void LuaEngine::BeginCall(uint16 fReference)
 {
-        if(fReference > 0)
-        {
-                lua_settop(lu,0); //stack should be empty
-                lua_rawgeti(lu,LUA_REGISTRYINDEX,fReference);
-                if(!lua_isfunction(lu,-1) )
-                        luaL_error(lu,"Attempted to call invalid function. \n");
-        }
+        lua_settop(lu,0); //stack should be empty
+        lua_getref(lu,fReference);
 }
 bool LuaEngine::ExecuteCall(uint8 params, uint8 res)
@@ -556 +551 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_SERVHOOK,0,ev,functionRef);
         return 0;
@@ -627 +622 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_DUMMYSPELL,entry,0,functionRef);
         return 0;
@@ -692 +687 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_UNIT,entry,ev,functionRef);
         return 0;
@@ -757 +752 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_QUEST,entry,ev,functionRef);
         return 0;
@@ -822 +817 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_GO,entry,ev,functionRef);
         return 0;
@@ -887 +882 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_UNIT_GOSSIP,entry,ev,functionRef);
         return 0;
@@ -951 +946 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_ITEM_GOSSIP,entry,ev,functionRef);
         return 0;
@@ -1012 +1007 @@
                 }
         }
-        if(functionRef)
+        if(functionRef > 0)
                 sLuaMgr.RegisterEvent(REGTYPE_GO_GOSSIP,entry,ev,functionRef);
         return 0;
@@ -2540 +2535 @@
                                                 }
                                                 else
+                                                {
+                                                        if(bind->m_functionReferences[evt] > 0)
+                                                                lua_unref(lu,bind->m_functionReferences[evt]);
                                                         bind->m_functionReferences[evt] = functionRef;
+                                                }
                                         }
                                 }break;
@@ -2554 +2553 @@
                                                 }
                                                 else
+                                                {
+                                                        if(bind->m_functionReferences[evt] > 0)
+                                                                lua_unref(lu,bind->m_functionReferences[evt]);
                                                         bind->m_functionReferences[evt] = functionRef;
+                                                }
                                         }
                                 }break;
@@ -2568 +2571 @@
                                                 }
                                                 else
+                                                {
+                                                        if(bind->m_functionReferences[evt] > 0)
+                                                                lua_unref(lu,bind->m_functionReferences[evt]);
                                                         bind->m_functionReferences[evt] = functionRef;
+                                                }
                                         }
                                 }break;
@@ -2592 +2599 @@
                                                 }
                                                 else
+                                                {
+                                                        if(bind->m_functionReferences[evt] > 0)
+                                                                lua_unref(lu,bind->m_functionReferences[evt]);
                                                         bind->m_functionReferences[evt] = functionRef;
+                                                }
                                         }
                                 }break;
@@ -2606 +2617 @@
                                                 }
                                                 else
+                                                {
+                                                        if(bind->m_functionReferences[evt] > 0)
+                                                                lua_unref(lu,bind->m_functionReferences[evt]);
                                                         bind->m_functionReferences[evt] = functionRef;
+                                                }
                                         }
                                 }break;
@@ -2620 +2635 @@
                                                 }
                                                 else
+                                                {
+                                                        if(bind->m_functionReferences[evt] > 0)
+                                                                lua_unref(lu,bind->m_functionReferences[evt]);
                                                         bind->m_functionReferences[evt] = functionRef;
+                                                }
                                         }
                                 }break;
@@ -2631 +2650 @@
         RemoveTimedEvents(lu);
         // clean up the engine of any existing defined variables
+        for(UnitBindingMap::iterator itr = m_unitBinding.begin(); itr != m_unitBinding.end(); ++itr)
+        {
+                for(int i = 0; i < CREATURE_EVENT_COUNT; ++i)
+                {
+                        if(itr->second.m_functionReferences[i] > 0)
+                                lua_unref(lu,itr->second.m_functionReferences[i]);
+                }
+        }
         m_unitBinding.clear();
+        for(GameObjectBindingMap::iterator itr = m_gameobjectBinding.begin(); itr != m_gameobjectBinding.end(); ++itr)
+        {
+                for(int i = 0; i < GAMEOBJECT_EVENT_COUNT; ++i)
+                {
+                        if(itr->second.m_functionReferences[i] > 0)
+                                lua_unref(lu,itr->second.m_functionReferences[i]);
+                }
+        }
         m_gameobjectBinding.clear();
+        for(QuestBindingMap::iterator itr = m_questBinding.begin(); itr != m_questBinding.end(); ++itr)
+        {
+                for(int i = 0; i < QUEST_EVENT_COUNT; ++i)
+                {
+                        if(itr->second.m_functionReferences[i] > 0)
+                                lua_unref(lu,itr->second.m_functionReferences[i]);
+                }
+        }
         m_questBinding.clear();
+        for(GossipUnitScriptsBindingMap::iterator itr = m_unit_gossipBinding.begin(); itr != m_unit_gossipBinding.end(); ++itr)
+        {
+                for(int i = 0; i < GOSSIP_EVENT_COUNT; ++i)
+                {
+                        if(itr->second.m_functionReferences[i] > 0)
+                                lua_unref(lu,itr->second.m_functionReferences[i]);
+                }
+        }
         m_unit_gossipBinding.clear();
+        for(GossipItemScriptsBindingMap::iterator itr = m_item_gossipBinding.begin(); itr != m_item_gossipBinding.end(); ++itr)
+        {
+                for(int i = 0; i < GOSSIP_EVENT_COUNT; ++i)
+                {
+                        if(itr->second.m_functionReferences[i] > 0)
+                                lua_unref(lu,itr->second.m_functionReferences[i]);
+                }
+        }
         m_item_gossipBinding.clear();
+        for(GossipGOScriptsBindingMap::iterator itr = m_go_gossipBinding.begin(); itr != m_go_gossipBinding.end(); ++itr)
+        {
+                for(int i = 0; i < GOSSIP_EVENT_COUNT; ++i)
+                {
+                        if(itr->second.m_functionReferences[i] > 0)
+                                lua_unref(lu,itr->second.m_functionReferences[i]);
+                }
+        }
         m_go_gossipBinding.clear();
         //Serv hooks : had forgotten these.
@@ -2641 +2708 @@
         {
                 vector<uint16> & next = EventAsToFuncName[i];
+                for(vector<uint16>::iterator itr = next.begin(); itr != next.end(); ++itr)
+                        lua_unref(lu,(*itr));
                 next.clear();
         }
+        for(map<uint32,uint16>::iterator itr = m_luaDummySpells.begin(); itr != m_luaDummySpells.end(); ++itr)
+                lua_unref(lu,itr->second);
         m_luaDummySpells.clear();
+        for(set<int>::iterator itr = m_pendingThreads.begin(); itr != m_pendingThreads.end(); ++itr)
+                lua_unref(lu,(*itr));
         m_pendingThreads.clear();
 

Trunk/src/LuaEngine/UnitFunctions.h

@@ -886 +886 @@
                 int flag = luaL_checkint( L, 1 );
                 Player* ret = NULL;
+                vector<Player*> players;
                 switch( flag )
                 {
@@ -907 +908 @@
 
                         {
-                                uint32 count = 0;
                                 for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
                                 {
                                         Player* obj = TO_PLAYER(*itr);
                                         if (obj && obj->CalcDistance(obj,ptr)<=8)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (obj && obj->CalcDistance(obj,ptr)<=8 && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
                 case RANDOM_IN_MIDRANGE:
                         {
-                                uint32 count = 0;
                                 for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
                                 {
                                         Player* obj = TO_PLAYER(*itr);
-                                        if (!obj)
-                                                continue;
                                         float distance = obj->CalcDistance(obj,ptr);
                                         if (distance<20 && distance>8)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (!obj)
-                                                        continue;
-                                                float distance = obj->CalcDistance(obj,ptr);
-                                                if (distance<20 && distance>8 && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
                 case RANDOM_IN_LONGRANGE:
                         {
-                                uint32 count = 0;
                                 for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
                                 {
                                         Player* obj = TO_PLAYER(*itr);
                                         if (obj && obj->CalcDistance(obj,ptr)>=20)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (obj && obj->CalcDistance(obj,ptr)>=20 && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
                 case RANDOM_WITH_MANA:
                         {
-                                uint32 count = 0;
                                 for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
                                 {
                                         Player* obj = TO_PLAYER(*itr);
                                         if (obj && obj->GetPowerType() == POWER_TYPE_MANA)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (obj && obj->GetPowerType() == POWER_TYPE_MANA && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
                 case RANDOM_WITH_ENERGY:
                         {
-                                uint32 count = 0;
                                 for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
                                 {
                                         Player* obj = TO_PLAYER(*itr);
                                         if (obj && obj->GetPowerType() == POWER_TYPE_ENERGY)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (obj && obj->GetPowerType() == POWER_TYPE_ENERGY && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
                 case RANDOM_WITH_RAGE:
                         {
-                                uint32 count = 0;
                                 for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
                                 {
                                         Player* obj = TO_PLAYER(*itr);
                                         if (obj && obj->GetPowerType() == POWER_TYPE_RAGE)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (obj && obj->GetPowerType() == POWER_TYPE_RAGE && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
@@ -1078 +984 @@
                                         Player* obj = TO_PLAYER(*itr);
                                         if (obj != mt)
-                                                ++count;
+                                                players.push_back(obj);
                                 }
-                                if (count)
-                                {
-                                        uint32 r = RandomUInt(count-1);
-                                        count=0;
-                                        for(set< Object* >::iterator itr = ptr->GetInRangePlayerSetBegin(); itr != ptr->GetInRangePlayerSetEnd(); ++itr)
-                                        {
-                                                Player* obj = TO_PLAYER(*itr);
-                                                if (obj && obj != mt && count==r)
-                                                {
-                                                        ret=obj;
-                                                        break;
-                                                }
-                                                ++count;
-                                        }
-                                }
+                                ret = players[RandomUInt(players.size()-1)];
                         }
                         break;
@@ -1108 +1000 @@
         int GetRandomFriend(lua_State * L, Unit * ptr)
         {
-                if(!ptr)
-                        return 0;
+                TEST_UNITPLAYER();
 
                 Unit * ret=NULL;
                 uint32 count = 0;
+                vector<Object*> allies;
 
                 for(set<Object*>::iterator itr = ptr->GetInRangeSetBegin(); itr != ptr->GetInRangeSetEnd(); ++itr)
@@ -1118 +1010 @@
                         Object* obj = TO_OBJECT(*itr);
                         if (obj->IsUnit() && isFriendly(obj,ptr))
-                                ++count;
-                }
-
-                if (count)
-                {
-                        uint32 r = RandomUInt(count-1);
-                        count=0;
-                        for(set<Object*>::iterator itr = ptr->GetInRangeSetBegin(); itr != ptr->GetInRangeSetEnd(); ++itr)
-                        {
-                                Object* obj = TO_OBJECT(*itr);
-                                if (obj->IsUnit() && isFriendly(obj,ptr) && count==r)
-                                {
-                                        ret= TO_UNIT(obj);
-                                        break;
-                                }
-                                ++count;
-                        }
-                }
-                if(ret==NULL)
-                        lua_pushnil(L);
-                else
-                        PUSH_UNIT(L,ret);
+                                allies.push_back(obj);
+                }
+                PUSH_UNIT(L,allies[RandomUInt(allies.size()-1)]);
                 return 1;
         }
         int GetRandomEnemy(lua_State * L, Unit * ptr)
         {
-                if(!ptr)
-                        return 0;
+                TEST_UNITPLAYER();
 
                 Unit * ret=NULL;
                 uint32 count = 0;
+                vector<Object*> enemies;
 
                 for(set<Object*>::iterator itr = ptr->GetInRangeSetBegin(); itr != ptr->GetInRangeSetEnd(); ++itr)
@@ -1154 +1027 @@
                         Object* obj = TO_OBJECT(*itr);
                         if (obj->IsUnit() && !isFriendly(obj,ptr))
-                                ++count;
-                }
-
-                if (count)
-                {
-                        uint32 r = RandomUInt(count-1);
-                        count=0;
-                        for(set<Object*>::iterator itr = ptr->GetInRangeSetBegin(); itr != ptr->GetInRangeSetEnd(); ++itr)
-                        {
-                                Object* obj = TO_OBJECT(*itr);
-                                if (obj->IsUnit() && !isFriendly(obj,ptr) && count==r)
-                                {
-                                        ret= TO_UNIT(obj);
-                                        break;
-                                }
-                                ++count;
-                        }
-                }
-                if(ret==NULL)
-                        lua_pushnil(L);
-                else
-                        PUSH_UNIT(L,ret);
+                                enemies.push_back(obj);
+                }
+                PUSH_UNIT(L,enemies[RandomUInt(enemies.size()-1)]);
                 return 1;
         }
@@ -1189 +1043 @@
         int RemoveAura(lua_State * L, Unit * ptr)
         {
-                if (!ptr) return 0;
+                TEST_UNITPLAYER()
                 int auraid = luaL_checkint(L,1);
                 ptr->RemoveAura(auraid);
@@ -1197 +1051 @@
         int CanAttack(lua_State * L, Unit * ptr)
         {
+                TEST_UNITPLAYER_RET();
                 Unit * target = CHECK_UNIT(L,1);
-                if (!ptr || !target) return 0;
+                if (!target) return 0;
                 if (isAttackable(ptr, target))
                         lua_pushboolean(L, 1);
@@ -1208 +1063 @@
         int PlaySoundToSet(lua_State * L, Unit * ptr)
         {
-                if (!ptr) return 0;
+                TEST_UNITPLAYER();
                 int soundid = luaL_checkint(L,1);
                 ptr->PlaySoundToSet(soundid);
@@ -1216 +1071 @@
         int PlaySoundToPlayer(lua_State * L, Unit * ptr)
         {
+                TEST_PLAYER();
                 int soundid = luaL_checkint(L,1);
                 Player* plr = TO_PLAYER(ptr);
-                if (!plr) return 0;
                 WorldPacket data;
         data.Initialize(SMSG_PLAY_OBJECT_SOUND);
@@ -5998 +5853 @@
                 return 4;
         }
+        int GetObject(lua_State * L, Unit * ptr)
+        {
+                TEST_UNIT();
+                uint64 guid = CHECK_GUID(L,1);
+                Object * obj = ptr->GetMapMgr()->_GetObject(guid);
+                if(obj != NULL && obj->IsUnit() )
+                        PUSH_UNIT(L,obj);
+                else if(obj != NULL && obj->IsGameObject() )
+                        PUSH_GO(L,obj);
+                else
+                        lua_pushnil(L);
+                return 1;
+        }
 }
 #endif