From 7425b5e367b2ff2b0331cfe5c58e9e0f07f42c2f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 7 Mar 2018 00:08:24 -0500
Subject: [PATCH] Fixed bullets being able to hit their own players

---
 core/assets/version.properties                   | 4 ++--
 core/src/io/anuke/mindustry/entities/Bullet.java | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index 8ac18e8dfc..ff6cb06da0 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Wed Mar 07 00:00:12 EST 2018
+#Wed Mar 07 00:06:45 EST 2018
 version=release
 androidBuildCode=339
 name=Mindustry
 code=3.4
-build=32
+build=custom build
diff --git a/core/src/io/anuke/mindustry/entities/Bullet.java b/core/src/io/anuke/mindustry/entities/Bullet.java
index d5d95b94d2..279993b4c4 100644
--- a/core/src/io/anuke/mindustry/entities/Bullet.java
+++ b/core/src/io/anuke/mindustry/entities/Bullet.java
@@ -4,7 +4,6 @@ import io.anuke.mindustry.entities.enemies.Enemy;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.entities.BulletEntity;
 import io.anuke.ucore.entities.Entity;
-import io.anuke.ucore.entities.SolidEntity;
 import io.anuke.ucore.util.Timer;
 
 import static io.anuke.mindustry.Vars.*;
@@ -65,11 +64,6 @@ public class Bullet extends BulletEntity{
 		}
 	}
 
-	@Override
-	public boolean collides(SolidEntity other){
-		return true;
-	}
-
 	@Override
 	public int getDamage(){
 		return damage == -1 ? type.damage : damage;