diff --git a/client/src/game.ts b/client/src/game.ts
index 3cb3cd2..da592f9 100644
--- a/client/src/game.ts
+++ b/client/src/game.ts
@@ -96,7 +96,7 @@ class Game {
                 return; // if the bullet just went OOB, no point checking for player hits... right?
             }
             this.game.state.alivePlayers.forEach((player: Entity): void => {
-                if (this.bulletHitPlayer(bullet, player)) {
+                if (this.game.bullet_ownership[bullet.id] != player.id && this.bulletHitPlayer(bullet, player)) {
                     destroyedBullets.push(bullet.id);
                     killedPlayers.push(player.id);
                 }
diff --git a/server/Cargo.lock b/server/Cargo.lock
index 6ceb8af..b124db9 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "tatsoryk-server"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
  "clap 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctrlc 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index d0669ed..09e5031 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/LoungeCPP/Tatsoryk/tree/master/server"
 readme = "README.md"
 keywords = ["game", "lounge", "server"]
 license = "MIT"
-version = "0.1.1"
+version = "0.1.2"
 # Remember to also modify options.rs authors
 authors = ["nabijaczleweli <nabijaczleweli@gmail.com>",
            "Cat Plus Plus <piotrlegnica@piotrl.pl>",
diff --git a/server/src/server/gamestate.rs b/server/src/server/gamestate.rs
index e1e77d4..7cbf148 100644
--- a/server/src/server/gamestate.rs
+++ b/server/src/server/gamestate.rs
@@ -137,7 +137,8 @@ impl GameState {
         // Check for collisions
         for (_, bullet) in &self.bullets {
             for (_, player) in &self.players {
-                if distance_between(bullet.bullet.x, bullet.bullet.y, player.x, player.y) <
+                if bullet.owner_id != player.id &&
+                   distance_between(bullet.bullet.x, bullet.bullet.y, player.x, player.y) <
                    BULLET_RADIUS + PLAYER_RADIUS {
                     destroyed_bullets.push(bullet.bullet.id);
                     destroyed_players.push((player.id, bullet.bullet.id));