Sync with latest round of TC branch ports (#532)

Author: Shauren

methods/TrinityCore/BattleGroundMethods.h

@@ -76,13 +76,14 @@ namespace LuaBattleGround
     }
 
     /**
-     * Returns the end time of the [BattleGround].
+     * Returns the time remaining in milliseconds until [BattleGround] closes and removes all players.
+     * This can be after battleground ends normally or when there are not enough players
      *
      * @return uint32 endTime
      */
     int GetEndTime(Eluna* E, BattleGround* bg)
     {
-        E->Push(bg->GetEndTime());
+        E->Push(bg->GetRemainingTime());
         return 1;
     }
 
@@ -220,7 +221,7 @@ namespace LuaBattleGround
         E->Push(bg->GetStatus());
         return 1;
     }
-    
+
     ElunaRegister<BattleGround> BattleGroundMethods[] =
     {
         // Getters

methods/TrinityCore/ItemMethods.h

@@ -484,7 +484,7 @@ namespace LuaItem
     */
     int GetFlags(Eluna* E, Item* item)
     {
-        E->Push(item->GetTemplate()->Flags);
+        E->Push(item->GetTemplate()->Flags[0]);
         return 1;
     }
 
@@ -495,7 +495,7 @@ namespace LuaItem
     */
     int GetFlags2(Eluna* E, Item* item)
     {
-        E->Push(item->GetTemplate()->Flags2);
+        E->Push(item->GetTemplate()->Flags[1]);
         return 1;
     }