Merge pull request #968 from Flet/spawnkill

Updating PlayerSpawn tiles (flag tiles) to only allow player to pass.
Maescool · May 17, 2012 · 139512b · 139512b
2 parents 129913c + c6032b6
commit 139512b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/com/mojang/mojam/level/tile/PlayerSpawn.java b/src/com/mojang/mojam/level/tile/PlayerSpawn.java
@@ -2,8 +2,10 @@
 
 import com.mojang.mojam.GameCharacter;
 import com.mojang.mojam.MojamComponent;
+import com.mojang.mojam.entity.Bullet;
 import com.mojang.mojam.entity.Entity;
 import com.mojang.mojam.entity.Player;
+import com.mojang.mojam.entity.loot.Loot;
 import com.mojang.mojam.entity.mob.Team;
 import com.mojang.mojam.level.Level;
 import com.mojang.mojam.screen.AbstractBitmap;
@@ -54,8 +56,13 @@ private GameCharacter getPlayerCharacter(int playerID){
 	    else return player.getCharacter();
 	}
 
-	public boolean canPass(Entity e) {
-		return true;
+	@Override
+	public boolean canPass(Entity e) { //only allow players/loot/bullets to pass the spawn flag
+		if ((e instanceof Player) || (e instanceof Loot) || (e instanceof Bullet)) {
+			return true;
+		}
+
+		return false;
 	}
 
 	public int getColor() {