From f73b2a188fa0daf930a8f36279c029ce9ed6d250 Mon Sep 17 00:00:00 2001
From: Viktor Lidholt <viktorl@google.com>
Date: Mon, 26 Oct 2015 16:26:48 -0700
Subject: [PATCH 1/3] Fixes warning in sprites

---
 skysprites/lib/src/physics_collision_groups.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skysprites/lib/src/physics_collision_groups.dart b/skysprites/lib/src/physics_collision_groups.dart
index 6c8a6337053..150e5e5e60e 100644
--- a/skysprites/lib/src/physics_collision_groups.dart
+++ b/skysprites/lib/src/physics_collision_groups.dart
@@ -16,7 +16,7 @@ class _PhysicsCollisionGroups {
         keys.add(key);
       }
     });
-    return key;
+    return keys;
   }
 
   int getBitmaskForKeys(List<Object> keys) {

From 8070d343b953412dcea6c62755ef2dce16305d5a Mon Sep 17 00:00:00 2001
From: Viktor Lidholt <viktorl@google.com>
Date: Mon, 26 Oct 2015 16:32:57 -0700
Subject: [PATCH 2/3] Fixes inferred type warning

---
 skysprites/lib/src/physics_collision_groups.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skysprites/lib/src/physics_collision_groups.dart b/skysprites/lib/src/physics_collision_groups.dart
index 150e5e5e60e..b40043b57c5 100644
--- a/skysprites/lib/src/physics_collision_groups.dart
+++ b/skysprites/lib/src/physics_collision_groups.dart
@@ -7,7 +7,7 @@ class _PhysicsCollisionGroups {
     getBitmaskForKeys(["Default"]);
   }
 
-  Map<Object,int> keyLookup = {};
+  Map<Object,int> keyLookup = <Object,int>{};
 
   List<Object> getKeysForBitmask(int bitmask) {
     List<Object> keys = [];

From e72d06b759b1177ff7122381c87a945a98e0b6ab Mon Sep 17 00:00:00 2001
From: Viktor Lidholt <viktorl@google.com>
Date: Mon, 26 Oct 2015 16:38:14 -0700
Subject: [PATCH 3/3] Fixes inferred type warning

---
 skysprites/lib/src/physics_collision_groups.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skysprites/lib/src/physics_collision_groups.dart b/skysprites/lib/src/physics_collision_groups.dart
index b40043b57c5..5cd412dd830 100644
--- a/skysprites/lib/src/physics_collision_groups.dart
+++ b/skysprites/lib/src/physics_collision_groups.dart
@@ -11,8 +11,8 @@ class _PhysicsCollisionGroups {
 
   List<Object> getKeysForBitmask(int bitmask) {
     List<Object> keys = [];
-    keyLookup.forEach((key, value) {
-      if (value & bitmask) {
+    keyLookup.forEach((Object key, int value) {
+      if (value & bitmask != null) {
         keys.add(key);
       }
     });