cleaning up

Ethan Abrams · Ethan Abrams · commit 9fe51906c19c · 2019-04-09T10:47:28.000-07:00
diff --git a/CaptureTheFlag.xcodeproj/project.pbxproj b/CaptureTheFlag.xcodeproj/project.pbxproj
@@ -26,33 +26,25 @@
 		AB6E607F20D8CFAA000186CC /* PointError.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB6E607E20D8CFAA000186CC /* PointError.swift */; };
 		AB782AFE20AEAE1F00B82F8D /* ListenerKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB782AFD20AEAE1F00B82F8D /* ListenerKey.swift */; };
 		AB84CFB82055BEA300B84764 /* CaptureTheFlagViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB84CFB72055BEA300B84764 /* CaptureTheFlagViewController.swift */; };
-		AB8F1C662095133700FC40FA /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB8F1C652095133700FC40FA /* File.swift */; };
 		ABA9ECF020C47EF600873A22 /* GameLobbyCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA9ECEF20C47EF600873A22 /* GameLobbyCell.swift */; };
 		ABAE1993209BB17800A8AE69 /* ServerAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABAE1992209BB17800A8AE69 /* ServerAccess.swift */; };
 		ABB8DCB79176121986F1BF69 /* Pods_CaptureTheFlagTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F9EA6B4F379DCAC5A26CB06 /* Pods_CaptureTheFlagTests.framework */; };
 		ABC67086210D7BF300F2408F /* Moveable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC67085210D7BF300F2408F /* Moveable.swift */; };
 		ABC67088210EB59700F2408F /* Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC67087210EB59700F2408F /* Location.swift */; };
-		ABD1B2F7207C4CE400EC5D01 /* PlayerLocationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABD1B2F6207C4CE400EC5D01 /* PlayerLocationDelegate.swift */; };
 		ABD1B2F9207C67B000EC5D01 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ABD1B2F8207C67B000EC5D01 /* Storyboard.storyboard */; };
 		ABD5992620E0B0BE00DEC51E /* GameError.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABD5992520E0B0BE00DEC51E /* GameError.swift */; };
 		ABDB395320CBB86E00D59923 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABDB395220CBB86E00D59923 /* FirstViewController.swift */; };
 		ABE421B420C368BC006C5166 /* CreateGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABE421B320C368BC006C5166 /* CreateGameViewController.swift */; };
-		ABE43CBE207C46470076F75B /* FlagLocationChangeDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABE43CBD207C46470076F75B /* FlagLocationChangeDelegate.swift */; };
 		ABF8B4E920BA37D700F72D41 /* MapFlagPlacementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABF8B4E820BA37D700F72D41 /* MapFlagPlacementViewController.swift */; };
 		F40C6A55221F7FBF00FC3B50 /* ConvenientPlayerAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40C6A54221F7FBF00FC3B50 /* ConvenientPlayerAnnotation.swift */; };
 		F40C6A58221F801D00FC3B50 /* ConvenientFlagAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40C6A57221F801D00FC3B50 /* ConvenientFlagAnnotation.swift */; };
 		F430E9DF21647D0C0092F26F /* GameBoundary.swift in Sources */ = {isa = PBXBuildFile; fileRef = F430E9DE21647D0C0092F26F /* GameBoundary.swift */; };
 		F430E9E121647D480092F26F /* BoundaryDirection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F430E9E021647D480092F26F /* BoundaryDirection.swift */; };
 		F444C951223A218B00FF17F3 /* GameOverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F444C950223A218B00FF17F3 /* GameOverViewController.swift */; };
-		F444C953223B18DB00FF17F3 /* ObserverDeletionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = F444C952223B18DB00FF17F3 /* ObserverDeletionKey.swift */; };
-		F444C956223B1FD900FF17F3 /* PlayerObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = F444C955223B1FD900FF17F3 /* PlayerObserver.swift */; };
 		F444C958223B42A000FF17F3 /* GameObserverDeletionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = F444C957223B42A000FF17F3 /* GameObserverDeletionKey.swift */; };
 		F465040121507F2B004A6078 /* CreateAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F465040021507F2B004A6078 /* CreateAccountViewController.swift */; };
-		F494BDC62152FDE6007E367C /* InnerConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F494BDC52152FDE6007E367C /* InnerConnection.swift */; };
 		F49F555C21F9796800EB5B8F /* ServerAccessTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F49F555B21F9796800EB5B8F /* ServerAccessTests.swift */; };
 		F4A0ED66219CB23F00FA5716 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A0ED65219CB23F00FA5716 /* LoginViewController.swift */; };
-		F4BD628021F677B1008F7621 /* TwoWayNSMapTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BD627F21F677B1008F7621 /* TwoWayNSMapTable.swift */; };
-		F4C66822214A1FA9002466B6 /* DictionaryCreatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4C66821214A1FA9002466B6 /* DictionaryCreatable.swift */; };
 		F4CB640122163F570011DE6B /* FlagAnnotationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4CB640022163F570011DE6B /* FlagAnnotationView.swift */; };
 		F4D06A012222016500012DB9 /* PlayerAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D06A002222016500012DB9 /* PlayerAnnotation.swift */; };
 		F4D06A0322220AB800012DB9 /* FlagAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D06A0222220AB800012DB9 /* FlagAnnotation.swift */; };
@@ -96,17 +88,14 @@
 		AB6E607E20D8CFAA000186CC /* PointError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointError.swift; sourceTree = "<group>"; };
 		AB782AFD20AEAE1F00B82F8D /* ListenerKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListenerKey.swift; sourceTree = "<group>"; };
 		AB84CFB72055BEA300B84764 /* CaptureTheFlagViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaptureTheFlagViewController.swift; sourceTree = "<group>"; };
-		AB8F1C652095133700FC40FA /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
 		ABA9ECEF20C47EF600873A22 /* GameLobbyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameLobbyCell.swift; sourceTree = "<group>"; };
 		ABAE1992209BB17800A8AE69 /* ServerAccess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerAccess.swift; sourceTree = "<group>"; };
 		ABC67085210D7BF300F2408F /* Moveable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Moveable.swift; sourceTree = "<group>"; };
 		ABC67087210EB59700F2408F /* Location.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Location.swift; sourceTree = "<group>"; };
-		ABD1B2F6207C4CE400EC5D01 /* PlayerLocationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerLocationDelegate.swift; sourceTree = "<group>"; };
 		ABD1B2F8207C67B000EC5D01 /* Storyboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = "<group>"; };
 		ABD5992520E0B0BE00DEC51E /* GameError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameError.swift; sourceTree = "<group>"; };
 		ABDB395220CBB86E00D59923 /* FirstViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = "<group>"; };
 		ABE421B320C368BC006C5166 /* CreateGameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateGameViewController.swift; sourceTree = "<group>"; };
-		ABE43CBD207C46470076F75B /* FlagLocationChangeDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlagLocationChangeDelegate.swift; sourceTree = "<group>"; };
 		ABF8B4E820BA37D700F72D41 /* MapFlagPlacementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapFlagPlacementViewController.swift; sourceTree = "<group>"; };
 		B7C5F2095690C496434BD146 /* Pods-CaptureTheFlag.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CaptureTheFlag.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CaptureTheFlag/Pods-CaptureTheFlag.debug.xcconfig"; sourceTree = "<group>"; };
 		D0116F43C1EE084FC1EF4C21 /* Pods-CaptureTheFlag.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CaptureTheFlag.release.xcconfig"; path = "Pods/Target Support Files/Pods-CaptureTheFlag/Pods-CaptureTheFlag.release.xcconfig"; sourceTree = "<group>"; };
@@ -116,15 +105,10 @@
 		F430E9DE21647D0C0092F26F /* GameBoundary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameBoundary.swift; sourceTree = "<group>"; };
 		F430E9E021647D480092F26F /* BoundaryDirection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BoundaryDirection.swift; sourceTree = "<group>"; };
 		F444C950223A218B00FF17F3 /* GameOverViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameOverViewController.swift; sourceTree = "<group>"; };
-		F444C952223B18DB00FF17F3 /* ObserverDeletionKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObserverDeletionKey.swift; sourceTree = "<group>"; };
-		F444C955223B1FD900FF17F3 /* PlayerObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerObserver.swift; sourceTree = "<group>"; };
 		F444C957223B42A000FF17F3 /* GameObserverDeletionKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameObserverDeletionKey.swift; sourceTree = "<group>"; };
 		F465040021507F2B004A6078 /* CreateAccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CreateAccountViewController.swift; path = /Users/ethana56/Desktop/CaptureTheFlagStuff/CaptureTheFlag/CaptureTheFlag/CreateAccountViewController.swift; sourceTree = "<absolute>"; };
-		F494BDC52152FDE6007E367C /* InnerConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InnerConnection.swift; sourceTree = "<group>"; };
 		F49F555B21F9796800EB5B8F /* ServerAccessTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerAccessTests.swift; sourceTree = "<group>"; };
 		F4A0ED65219CB23F00FA5716 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
-		F4BD627F21F677B1008F7621 /* TwoWayNSMapTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoWayNSMapTable.swift; sourceTree = "<group>"; };
-		F4C66821214A1FA9002466B6 /* DictionaryCreatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DictionaryCreatable.swift; sourceTree = "<group>"; };
 		F4CB640022163F570011DE6B /* FlagAnnotationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlagAnnotationView.swift; sourceTree = "<group>"; };
 		F4D06A002222016500012DB9 /* PlayerAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerAnnotation.swift; sourceTree = "<group>"; };
 		F4D06A0222220AB800012DB9 /* FlagAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlagAnnotation.swift; sourceTree = "<group>"; };
@@ -209,7 +193,6 @@
 				45F8E9BB2058766600E88BC6 /* JoinGameViewController.swift */,
 				ABDB395220CBB86E00D59923 /* FirstViewController.swift */,
 				ABE421B320C368BC006C5166 /* CreateGameViewController.swift */,
-				AB8F1C652095133700FC40FA /* File.swift */,
 				45F8E9B9205874CB00E88BC6 /* TeamNameViewController.swift */,
 				6BEC9A7C20360BCC003A1296 /* Main.storyboard */,
 				ABD1B2F8207C67B000EC5D01 /* Storyboard.storyboard */,
@@ -234,7 +217,6 @@
 			isa = PBXGroup;
 			children = (
 				AB2D3CAC20A63E5B00A2703B /* WebbsocketRequestResponse.swift */,
-				F494BDC52152FDE6007E367C /* InnerConnection.swift */,
 				AB63600C2111622000C273E6 /* asyncRequestResponse.swift */,
 				AB6E607E20D8CFAA000186CC /* PointError.swift */,
 				AB0429BD20A6DA05003D1BD0 /* Message.swift */,
@@ -249,20 +231,14 @@
 			children = (
 				ABAE1992209BB17800A8AE69 /* ServerAccess.swift */,
 				6BEC9A9E20360C60003A1296 /* Player.swift */,
-				F444C955223B1FD900FF17F3 /* PlayerObserver.swift */,
 				F430E9E021647D480092F26F /* BoundaryDirection.swift */,
 				F430E9DE21647D0C0092F26F /* GameBoundary.swift */,
 				ABD5992520E0B0BE00DEC51E /* GameError.swift */,
 				6BEC9A9B20360C60003A1296 /* Flag.swift */,
-				ABE43CBD207C46470076F75B /* FlagLocationChangeDelegate.swift */,
 				ABC67085210D7BF300F2408F /* Moveable.swift */,
-				ABD1B2F6207C4CE400EC5D01 /* PlayerLocationDelegate.swift */,
 				6BEC9A9920360C60003A1296 /* Team.swift */,
 				ABC67087210EB59700F2408F /* Location.swift */,
-				F4C66821214A1FA9002466B6 /* DictionaryCreatable.swift */,
-				F4BD627F21F677B1008F7621 /* TwoWayNSMapTable.swift */,
 				F49F555B21F9796800EB5B8F /* ServerAccessTests.swift */,
-				F444C952223B18DB00FF17F3 /* ObserverDeletionKey.swift */,
 				F444C957223B42A000FF17F3 /* GameObserverDeletionKey.swift */,
 			);
 			path = DataAccess;
@@ -524,16 +500,13 @@
 				ABA9ECF020C47EF600873A22 /* GameLobbyCell.swift in Sources */,
 				F4E3BED4220E221900BAD802 /* PlayerAnnotationView.swift in Sources */,
 				ABE421B420C368BC006C5166 /* CreateGameViewController.swift in Sources */,
-				F4BD628021F677B1008F7621 /* TwoWayNSMapTable.swift in Sources */,
 				45F8E9BC2058766600E88BC6 /* JoinGameViewController.swift in Sources */,
 				6BEC9AA020360C60003A1296 /* Team.swift in Sources */,
 				F430E9DF21647D0C0092F26F /* GameBoundary.swift in Sources */,
 				AB54F4E52106E7FA00D6737C /* ServerErrorViewController.swift in Sources */,
 				AB782AFE20AEAE1F00B82F8D /* ListenerKey.swift in Sources */,
 				AB2D3CAD20A63E5B00A2703B /* WebbsocketRequestResponse.swift in Sources */,
 				45F8E9BE2058788400E88BC6 /* GameLobbyViewController.swift in Sources */,
-				F4C66822214A1FA9002466B6 /* DictionaryCreatable.swift in Sources */,
-				ABD1B2F7207C4CE400EC5D01 /* PlayerLocationDelegate.swift in Sources */,
 				F4D06A012222016500012DB9 /* PlayerAnnotation.swift in Sources */,
 				AB0429BE20A6DA05003D1BD0 /* Message.swift in Sources */,
 				F4A0ED66219CB23F00FA5716 /* LoginViewController.swift in Sources */,
@@ -545,17 +518,12 @@
 				ABAE1993209BB17800A8AE69 /* ServerAccess.swift in Sources */,
 				AB6E607F20D8CFAA000186CC /* PointError.swift in Sources */,
 				ABDB395320CBB86E00D59923 /* FirstViewController.swift in Sources */,
-				F444C953223B18DB00FF17F3 /* ObserverDeletionKey.swift in Sources */,
 				F40C6A58221F801D00FC3B50 /* ConvenientFlagAnnotation.swift in Sources */,
 				AB84CFB82055BEA300B84764 /* CaptureTheFlagViewController.swift in Sources */,
 				F40C6A55221F7FBF00FC3B50 /* ConvenientPlayerAnnotation.swift in Sources */,
-				AB8F1C662095133700FC40FA /* File.swift in Sources */,
 				AB63600D2111622000C273E6 /* asyncRequestResponse.swift in Sources */,
-				F494BDC62152FDE6007E367C /* InnerConnection.swift in Sources */,
 				AB6E607D20D7275C000186CC /* ServerPointErrors.swift in Sources */,
 				ABF8B4E920BA37D700F72D41 /* MapFlagPlacementViewController.swift in Sources */,
-				F444C956223B1FD900FF17F3 /* PlayerObserver.swift in Sources */,
-				ABE43CBE207C46470076F75B /* FlagLocationChangeDelegate.swift in Sources */,
 				6BEC9AA220360C60003A1296 /* Flag.swift in Sources */,
 				ABC67086210D7BF300F2408F /* Moveable.swift in Sources */,
 				6BEC9A7920360BCC003A1296 /* AppDelegate.swift in Sources */,
diff --git a/CaptureTheFlag/CreateAccountViewController.swift b/CaptureTheFlag/CreateAccountViewController.swift
@@ -1,10 +1,3 @@
-//
-//  CreateAccountViewController.swift
-//  
-//
-//  Created by Ethan Abrams on 9/17/18.
-//
-
 import UIKit
 
 class CreateAccountViewController: CaptureTheFlagViewController {
diff --git a/CaptureTheFlag/CreateGameViewController.swift b/CaptureTheFlag/CreateGameViewController.swift
@@ -1,11 +1,3 @@
-//
-//  CreateGameViewController.swift
-//  CaptureTheFlag
-//
-//  Created by Ethan Abrams on 6/2/18.
-//  Copyright © 2018 Joe Durand. All rights reserved.
-//
-
 import UIKit
 
 class CreateGameViewController: CaptureTheFlagViewController {
diff --git a/CaptureTheFlag/DataAccess/DictionaryCreatable.swift b/CaptureTheFlag/DataAccess/DictionaryCreatable.swift
diff --git a/CaptureTheFlag/DataAccess/Flag.swift b/CaptureTheFlag/DataAccess/Flag.swift
@@ -1,11 +1,11 @@
 import CoreLocation
 
 class Flag: Equatable, Moveable, Hashable {
-    var location: Location?
-    var id: String
-    var name: String? = nil
-    weak var heldBy: Player?
-    weak var team: Team?
+    public var location: Location?
+    public var id: String
+    public var name: String? = nil
+    weak public var heldBy: Player?
+    weak public var team: Team?
     private var heldObservers = [GameObserverDeletionKey : (Bool, Player) -> ()]()
     private var locationObservers = [GameObserverDeletionKey : (Location) -> ()]()
     
diff --git a/CaptureTheFlag/DataAccess/FlagLocationChangeDelegate.swift b/CaptureTheFlag/DataAccess/FlagLocationChangeDelegate.swift
diff --git a/CaptureTheFlag/DataAccess/GameObserverDeletionKey.swift b/CaptureTheFlag/DataAccess/GameObserverDeletionKey.swift
@@ -1,14 +1,14 @@
 import Foundation
 
-
+typealias ObserverType = String
 struct GameObserverDeletionKey: Hashable, Equatable {
     let key = UUID()
     let observerType: ObserverType
     init(observerType: ObserverType) {
         self.observerType = observerType
     }
 }
-typealias ObserverType = String
+
 
 
 
diff --git a/CaptureTheFlag/DataAccess/ObserverDeletionKey.swift b/CaptureTheFlag/DataAccess/ObserverDeletionKey.swift
diff --git a/CaptureTheFlag/DataAccess/PlayerLocationDelegate.swift b/CaptureTheFlag/DataAccess/PlayerLocationDelegate.swift
diff --git a/CaptureTheFlag/DataAccess/PlayerObserver.swift b/CaptureTheFlag/DataAccess/PlayerObserver.swift
diff --git a/CaptureTheFlag/DataAccess/ServerAccessTests.swift b/CaptureTheFlag/DataAccess/ServerAccessTests.swift
@@ -1,10 +1,3 @@
-//
-//  ServerAccessTests.swift
-//  CaptureTheFlagTests
-//
-//  Created by Ethan Abrams on 1/23/19.
-//  Copyright © 2019 Joe Durand. All rights reserved.
-//
 
 import XCTest
 @testable import CaptureTheFlag
diff --git a/CaptureTheFlag/DataAccess/Team.swift b/CaptureTheFlag/DataAccess/Team.swift
@@ -71,9 +71,9 @@ class Team: CustomStringConvertible, Hashable, Equatable {
     public func removeObserver(key: GameObserverDeletionKey) -> Bool {
         switch key.observerType {
         case TeamObserverType.playerAdded:
-            return self.playerAddedRemovedObservers.removeValue(forKey: key) != nil ? true : false
+            return self.playerAddedRemovedObservers.removeValue(forKey: key) != nil
         case TeamObserverType.flagAdded:
-            return self.flagAddedRemovedObservers.removeValue(forKey: key) != nil ? true : false
+            return self.flagAddedRemovedObservers.removeValue(forKey: key) != nil
         default:
             return false
         }
diff --git a/CaptureTheFlag/GameLobbyCell.swift b/CaptureTheFlag/GameLobbyCell.swift
@@ -1,5 +1,3 @@
-
-
 import UIKit
 
 class GameLobbyCell: UITableViewCell {
diff --git a/CaptureTheFlag/JoinGameViewController.swift b/CaptureTheFlag/JoinGameViewController.swift
@@ -1,11 +1,3 @@
-//
-//  JoinGameViewController.swift
-//  CaptureTheFlag
-//
-//  Created by Carlos Garcia jr on 3/13/18.
-//  Copyright © 2018 Joe Durand. All rights reserved.
-//
-
 import UIKit
 import SwiftWebSocket
 import CoreLocation
diff --git a/CaptureTheFlag/ServerErrorViewController.swift b/CaptureTheFlag/ServerErrorViewController.swift
@@ -1,11 +1,3 @@
-//
-//  ViewController.swift
-//  CaptureTheFlag
-//
-//  Created by Ethan Abrams on 7/23/18.
-//  Copyright © 2018 Joe Durand. All rights reserved.
-//
-
 import UIKit
 
 class ViewController: CaptureTheFlagViewController {
diff --git a/CaptureTheFlag/TeamNameViewController.swift b/CaptureTheFlag/TeamNameViewController.swift
@@ -1,11 +1,3 @@
-//
-//  TeamNameViewController.swift
-//  CaptureTheFlag
-//
-//  Created by Carlos Garcia jr on 3/13/18.
-//  Copyright © 2018 Joe Durand. All rights reserved.
-//
-
 import UIKit
 
 class TeamNameViewController: CaptureTheFlagViewController {
@@ -20,8 +12,4 @@ class TeamNameViewController: CaptureTheFlagViewController {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
-    
-
-    f
-
 }
diff --git a/CaptureTheFlag/WebSocketRequestResponse/InnerConnection.swift b/CaptureTheFlag/WebSocketRequestResponse/InnerConnection.swift
diff --git a/CaptureTheFlag/WebSocketRequestResponse/WebbsocketRequestResponse.swift b/CaptureTheFlag/WebSocketRequestResponse/WebbsocketRequestResponse.swift
@@ -1,4 +1,3 @@
-//Copyright © 2018 Ethan Abrams. All rights reserved.
 import Foundation
 import SwiftWebSocket
 public class WebSocketRequestResponse: AsyncRequestResponse {

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`import Foundation`
`2`	`2`
`3`		`-`
	`3`	`+typealias ObserverType = String`
`4`	`4`	`struct GameObserverDeletionKey: Hashable, Equatable {`
`5`	`5`	`let key = UUID()`
`6`	`6`	`let observerType: ObserverType`
`7`	`7`	`init(observerType: ObserverType) {`
`8`	`8`	`self.observerType = observerType`
`9`	`9`	`}`
`10`	`10`	`}`
`11`		`-typealias ObserverType = String`
	`11`	`+`
`12`	`12`
`13`	`13`
`14`	`14`