Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
+++ common/Game.cpp	(revision 426fb84d80ff779912355be9d6c298e75da3cdfa)
@@ -184,5 +184,5 @@
          switch (it->type) {
             case OBJECT_BLUE_FLAG:
-               if (p->team == 1) {
+               if (p->team == 2) {
                   p->hasBlueFlag = true;
                   itemId = it->id;
@@ -190,5 +190,5 @@
                break;
             case OBJECT_RED_FLAG:
-               if (p->team == 0) {
+               if (p->team == 1) {
                   p->hasRedFlag = true;
                   itemId = it->id;
Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
+++ common/Player.cpp	(revision 426fb84d80ff779912355be9d6c298e75da3cdfa)
@@ -30,5 +30,5 @@
    this->range = 0;
    this->attackCooldown = 0;
-   this->team = 0;   // blue team by default
+   this->team = 0;   // no team by default
    this->hasBlueFlag = false;
    this->hasRedFlag = false;
@@ -104,5 +104,5 @@
    this->range = 0;
    this->attackCooldown = 0;
-   this->team = 0;   // blue team by default
+   this->team = 0;   // no team by default
    this->hasBlueFlag = false;
    this->hasRedFlag = false;
Index: common/Player.h
===================================================================
--- common/Player.h	(revision 306758ef5412fe59b4375b110891389459409b21)
+++ common/Player.h	(revision 426fb84d80ff779912355be9d6c298e75da3cdfa)
@@ -84,5 +84,5 @@
    int range;
    unsigned long long attackCooldown;
-   int team; // 0 is blue, 1 is red
+   int team; // 0 is none, 1 is blue, 2 is red
    bool hasBlueFlag;
    bool hasRedFlag;