diff --git a/src/main/java/org/drtshock/BurntException.java b/src/main/java/org/drtshock/BurntException.java index aec2d35b..6cda3503 100644 --- a/src/main/java/org/drtshock/BurntException.java +++ b/src/main/java/org/drtshock/BurntException.java @@ -5,8 +5,8 @@ */ public class BurntException extends Exception { - public BurntException(int degrees) { - super("Potato is badly burnt by trying to boil it at " + degrees + " degrees!!"); + public BurntException(int waterDegreesFahrenheit, int waterDegreesCelsius) { + super("Potato is badly burnt by trying to boil it at (F:" + waterDegreesFahrenheit + ") (C:" + waterDegreesCelsius + ") degrees!!"); } public BurntException(long bakeTime) { diff --git a/src/main/java/org/drtshock/Potato.java b/src/main/java/org/drtshock/Potato.java index 0d1d4c2a..63f56352 100644 --- a/src/main/java/org/drtshock/Potato.java +++ b/src/main/java/org/drtshock/Potato.java @@ -113,12 +113,13 @@ public boolean isBaked() { * @throws BurntException if the potato has been burned during the process of cooking */ public boolean hasBeenBoiledInWater() throws BurntException { - int waterDegrees = (int) (Math.random() * 200); - System.out.println("Trying to boil potato at " + waterDegrees + " degrees."); - if (waterDegrees < 70) { + int waterDegreesFahrenheit = (int) (Math.random() * 200); + int waterDegreesCelsius = (int) ((waterDegreesFahrenheit - 32) / 1.8); + System.out.println("Trying to boil potato at (F:" + waterDegreesFahrenheit + ") (C:" + waterDegreesCelsius + ") degrees."); + if (waterDegreesFahrenheit < 70) { return false; - } else if (waterDegrees > 130) { - throw new BurntException(waterDegrees); + } else if (waterDegreesFahrenheit > 130) { + throw new BurntException(waterDegreesFahrenheit, waterDegreesCelsius); } return true; }