Merge pull request #730 from Elosanda/develop

fixed crash, when running in singleplayer to opposite base
Maescool · Mar 4, 2012 · 867f5a4 · 867f5a4
2 parents ce3bfe8 + c73b6c4
commit 867f5a4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/com/mojang/mojam/level/Level.java b/src/com/mojang/mojam/level/Level.java
@@ -349,7 +349,9 @@ private void renderTilesAndBases(Screen screen, int x0, int y0, int x1, int y1){
 	}
 
 	private GameCharacter getPlayerCharacter(int playerID){
-		return MojamComponent.instance.players[playerID].getCharacter();
+	    Player player = MojamComponent.instance.players[playerID];
+	    if (player == null) return GameCharacter.None;
+	    else return player.getCharacter();
 	}
 
 	private void renderTopOfWalls(Screen screen, int x0, int y0, int x1, int y1){