formated and fix a face colour bug

Author: redomar

src/com/redomar/game/entities/Dummy.java

@@ -13,7 +13,7 @@ public class Dummy extends Mob {
 	private int xa = 0;
 	private int ya = 0;
 	private boolean[] swimType;
-	
+
 	private Swim swim;
 
 	public Dummy(LevelHandler level, String name, int x, int y, int shirtCol,
@@ -28,7 +28,7 @@ public void tick() {
 
 		followMovementAI(getX(), getY(), Game.getPlayer().getX(), Game
 				.getPlayer().getY(), xa, ya, this);
-		
+
 		setSwim(new Swim(level, getX(), getY()));
 		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
 		isSwimming = swimType[0];
@@ -104,12 +104,12 @@ public void render(Screen screen) {
 			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
 					0x01, 1);
 		}
-		
+
 		if (isMuddy) {
 			int waterColour = 0;
 			yOffset += 4;
 
-			colour = Colours.get(-1, 111, -1, 310);
+			colour = Colours.get(-1, 111, -1, faceCol);
 
 			if (tickCount % 60 < 15) {
 				waterColour = Colours.get(-1, -1, 422, -1);

src/com/redomar/game/entities/Player.java

@@ -20,7 +20,6 @@ public class Player extends Mob {
 	private int tickCount = 0;
 	private String userName;
 	private boolean[] swimType;
-	
 
 	public static String guestPlayerName = customeName.setName("Player ");
 
@@ -62,7 +61,7 @@ public void tick() {
 		} else {
 			isMoving = false;
 		}
-		
+
 		setSwim(new Swim(level, getX(), getY()));
 		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
 		isSwimming = swimType[0];
@@ -76,7 +75,6 @@ public void tick() {
 		tickCount++;
 	}
 
-	
 	public void render(Screen screen) {
 		int xTile = 0;
 		int yTile = 28;
@@ -146,7 +144,7 @@ public void render(Screen screen) {
 			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
 					0x01, 1);
 		}
-		
+
 		if (isMuddy) {
 			int waterColour = 0;
 			yOffset += 4;

src/com/redomar/game/entities/efx/Swim.java

@@ -3,61 +3,58 @@
 import com.redomar.game.level.LevelHandler;
 
 public class Swim {
-	
+
 	private static LevelHandler level;
 	private int x;
 	private int y;
 
-	public Swim(LevelHandler level, int x, int y){
+	public Swim(LevelHandler level, int x, int y) {
 		Swim.level = level;
 		this.x = x;
 		this.y = y;
 	}
-	
-	public boolean water(boolean isSwimming){
+
+	public boolean water(boolean isSwimming) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 4) {
 			isSwimming = true;
 		}
 
-		if (isSwimming
-				&& level.getTile(x >> 3, y >> 3).getId() != 4) {
+		if (isSwimming && level.getTile(x >> 3, y >> 3).getId() != 4) {
 			isSwimming = false;
 		}
 		return isSwimming;
 	}
-	
-	public boolean magma(boolean isMagma){
+
+	public boolean magma(boolean isMagma) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 12) {
 			isMagma = true;
 		}
 
-		if (isMagma
-				&& level.getTile(x >> 3, y >> 3).getId() != 12) {
+		if (isMagma && level.getTile(x >> 3, y >> 3).getId() != 12) {
 			isMagma = false;
 		}
-		
+
 		return isMagma;
 	}
-	
-	public boolean mud(boolean isMuddy){
+
+	public boolean mud(boolean isMuddy) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 14) {
 			isMuddy = true;
 		}
 
-		if (isMuddy
-				&& level.getTile(x >> 3, y >> 3).getId() != 14) {
+		if (isMuddy && level.getTile(x >> 3, y >> 3).getId() != 14) {
 			isMuddy = false;
 		}
-		
+
 		return isMuddy;
 	}
-	
+
 	public boolean[] swimming(boolean isSwimming, boolean isMagma, boolean isMuddy) {
 		boolean[] swimminhType;
 		swimminhType = new boolean[3];
-		swimminhType [0] = water(isSwimming);
-		swimminhType [1] = magma(isMagma);
-		swimminhType [2] = mud(isMuddy);
+		swimminhType[0] = water(isSwimming);
+		swimminhType[1] = magma(isMagma);
+		swimminhType[2] = mud(isMuddy);
 		return swimminhType;
 	}
 }