diff --git a/js/class.js b/js/class.js
index c73dd75..5f1b4ab 100644
--- a/js/class.js
+++ b/js/class.js
@@ -103,20 +103,16 @@ class Player
     }
 }
 
-function dist(A,B)
-{
-    return Math.sqrt((A.x-B.x)**2+(A.y-B.y)**2);
-}
-
 class Bullet
 {
-    constructor (x,y,dx,dy)
+    constructor (x,y,dx,dy,id)
     {
         this.x=x;
         this.y=y;
         this.dx=dx;
         this.dy=dy;
         this.deleted=false;
+        this.parentId=id;
     }
 
     update(dt)
@@ -132,7 +128,7 @@ class Bullet
     {
         if(!this.deleted)
         {
-            if(player!=null && dist(player,this)<playerSize/2)
+            if(player!=null && player.id!=this.parentId && Math.sqrt((player.x-this.x)**2+(player.y-this.y)**2)<playerSize/2)
             {
                 player.takeDamage(1);
                 this.deleted=true;
diff --git a/js/input.js b/js/input.js
index 8f1a019..f2e5bc7 100644
--- a/js/input.js
+++ b/js/input.js
@@ -22,10 +22,10 @@ class Input {
             let dx = this.mouseX-this.player.x;
             let dy = this.mouseY-this.player.y;
             let norm = Math.sqrt(dx*dx+dy*dy);
-            let b = new Bullet(this.player.x,this.player.y,dx/norm,dy/norm);
+            let b = new Bullet(this.player.x,this.player.y,dx/norm,dy/norm,this.player.id);
             this.bullets.push(b);
             this.renderer.addBullet(b);
-            this.network.newBullet(this.player.x,this.player.y,dx/norm,dy/norm);
+            this.network.newBullet(b.x,b.y,b.dx,b.dy,b.parentId);
         });
 
         /*window.addEventListener("keydown", function(event) {
diff --git a/js/network.js b/js/network.js
index 4f1b0d6..469715d 100644
--- a/js/network.js
+++ b/js/network.js
@@ -35,7 +35,7 @@ class Network{
 				this.playersToRemove.push(data.data.id);
 				break;
 			case "newBullet":
-				this.bulletsToAdd.push(new Bullet(data.data.x,data.data.y,data.data.dx,data.data.dy));
+				this.bulletsToAdd.push(new Bullet(data.data.x,data.data.y,data.data.dx,data.data.dy,data.data.id));
 				break;
 			default:
 				break;
@@ -59,9 +59,9 @@ class Network{
 		}));
 	}
 
-	newBullet(x_,y_,dx_,dy_)
+	newBullet(x_,y_,dx_,dy_,parentId)
 	{
-		this.socket.send(JSON.stringify({type:"newBullet",data:{x: x_,y: y_,dx: dx_,dy: dy_}}));
+		this.socket.send(JSON.stringify({type:"newBullet",data:{x: x_,y: y_,dx: dx_,dy: dy_,id:parentId}}));
 	}
 
 	getPlayersToAdd(){  //returns the list of new players