--- a/src/Player.cc	Mon Dec 08 17:27:25 2008 +0000
+++ b/src/Player.cc	Mon Dec 08 17:30:17 2008 +0000
@@ -218,10 +218,11 @@
 
     // Currently we handle only player-player collision here.
     // Player-projectile collision is handled in projectile's onCollision.
-    // XXX: not network-safe
+    // XXX: not completely network-safe
     if (other->getType() == PLAYER) {
         Vector normal = this->getPosition() - other->getPosition();
         this->bounce(normal);
+
         // Move the player back to its previous position so that players won't
         // stuff inside each others when having a collision walk, e.g.
         this->setPosition(this->getPreviousPosition());

--- a/src/Weapons.cc	Mon Dec 08 17:27:25 2008 +0000
+++ b/src/Weapons.cc	Mon Dec 08 17:30:17 2008 +0000
@@ -17,7 +17,7 @@
     {   10000,  3 * 80 + 50,    3 * 5 + 5,     2 * 6 + 5,   3,      2 * 100 + 50,   0.00,   "Weapon 3"      },
     {   10000,  2 * 80 + 50,    4 * 5 + 5,     3 * 6 + 5,   4,      3 * 100 + 50,   0.00,   "Weapon 4"      },
     {   10000,  1 * 80 + 50,    5 * 5 + 5,     4 * 6 + 5,   5,      4 * 100 + 50,   0.00,   "Weapon 5"      },
-    {   10000,  600,            50000,         100,         10,     1000,           1.05,   "BounceBounce"  },
+    {   1000,   600,            50000,         100,         10,     1000,           1.05,   "BounceBounce"  },
     {   0,      0,              0,             0,           0,      0,              0.00,   ""              }
 };