diff --git a/MerchantRPGCSE2102/src/game/RPGame.java b/MerchantRPGCSE2102/src/game/RPGame.java index 9556a4c..4942c07 100644 --- a/MerchantRPGCSE2102/src/game/RPGame.java +++ b/MerchantRPGCSE2102/src/game/RPGame.java @@ -56,7 +56,12 @@ public ArrayList getMerchantInventory(int merchantNumber) { return merchantInventory1; else if (merchantNumber == 2) return merchantInventory2; - else + else if (merchantNumber == 3) return merchantInventory3; + else + { + System.out.println("Invalid merchant number"); + return null; + } } }