Fixed merge

NullSoldier · Jan 24, 2015 · 0be239f · 0be239f
1 parent 0812265
commit 0be239f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/common/ai/avoidai.ts b/src/common/ai/avoidai.ts
@@ -10,7 +10,7 @@ class AvoidPlayerAI extends PlayerAI {
 
   update(room : Room) : void {
     // TODO(strager): Smarter algorithm.
-    var nearestEnemy = this.nearestEnemy(players)
+    var nearestEnemy = this.nearestEnemy(room.players)
     if (nearestEnemy === null) {
       return
     }

diff --git a/src/common/ai/followai.ts b/src/common/ai/followai.ts
@@ -8,8 +8,8 @@ class FollowNearestPlayerAI extends PlayerAI {
     this.minApproachDistance = 100
   }
 
-  update(players : Array<Player>) : void {
-    var nearestEnemy = this.nearestEnemy(players)
+  update(room : Room) : void {
+    var nearestEnemy = this.nearestEnemy(room.players)
     if (nearestEnemy === null) {
       return
     }