From 1fdf4f371d39285bf144292bb613a50e0199621e Mon Sep 17 00:00:00 2001
From: Chump <chump29@users.noreply.github.com>
Date: Sun, 26 Jun 2022 15:11:49 -0500
Subject: [PATCH] Fix for issues #1735 & #1736 (#1737)

* Update Database.lua

Remove duplicate function

* Update PseudoATC.lua

Added nil check
---
 Moose Development/Moose/Core/Database.lua        | 10 ----------
 Moose Development/Moose/Functional/PseudoATC.lua | 11 +++++++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua
index 002b43c6e..1cc49fde7 100644
--- a/Moose Development/Moose/Core/Database.lua	
+++ b/Moose Development/Moose/Core/Database.lua	
@@ -241,16 +241,6 @@ function DATABASE:DeleteAirbase( AirbaseName )
   self.AIRBASES[AirbaseName] = nil
 end
 
---- Finds an AIRBASE based on the AirbaseName.
--- @param #DATABASE self
--- @param #string AirbaseName
--- @return Wrapper.Airbase#AIRBASE The found AIRBASE.
-function DATABASE:FindAirbase( AirbaseName )
-
-  local AirbaseFound = self.AIRBASES[AirbaseName]
-  return AirbaseFound
-end
-
 do -- Zones
 
   --- Finds a @{Zone} based on the zone name.
diff --git a/Moose Development/Moose/Functional/PseudoATC.lua b/Moose Development/Moose/Functional/PseudoATC.lua
index 7358dda2c..7e26f74e7 100644
--- a/Moose Development/Moose/Functional/PseudoATC.lua	
+++ b/Moose Development/Moose/Functional/PseudoATC.lua	
@@ -949,11 +949,14 @@ function PSEUDOATC:LocalAirports(GID, UID)
     for _,airbase in pairs(airports) do
     
       local name=airbase:getName()
-      local q=AIRBASE:FindByName(name):GetCoordinate()
-      local d=q:Get2DDistance(pos)
+      local a=AIRBASE:FindByName(name)
+      if a then
+        local q=a:GetCoordinate()
+        local d=q:Get2DDistance(pos)
       
-      -- Add to table.
-      table.insert(self.group[GID].player[UID].airports, {distance=d, name=name})
+        -- Add to table.
+        table.insert(self.group[GID].player[UID].airports, {distance=d, name=name})
+      end
       
     end
   end