From 143e81da0762a31f77fe2bffffdf04407a91939f Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Sat, 7 Jun 2014 17:19:02 +0300
Subject: [PATCH] Eluna fix merge changes

---
 PlayerMethods.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PlayerMethods.h b/PlayerMethods.h
index 15c4260..b8b618d 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -739,7 +739,7 @@ namespace LuaPlayer
 #ifdef MANGOS
         Eluna::Push(L, player->GetMap()->GetUnit(player->GetComboTargetGuid()));
 #else
-        Eluna::Push(L, Unit::GetUnit(*player, player->GetComboTarget()));
+        Eluna::Push(L, ObjectAccessor::GetUnit(*player, player->GetComboTarget()));
 #endif
         return 1;
     }