From decf1985cb725f895a6035c9b4461fa42ee8b929 Mon Sep 17 00:00:00 2001
From: Gavin Li <itsgavin.li@gmail.com>
Date: Mon, 9 Feb 2015 11:41:03 -0500
Subject: [PATCH] RPGame: Made slight change to getMerchantInventory method to
 allow for error detection in merchantNumber

---
 MerchantRPGCSE2102/src/game/RPGame.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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<String> 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;
+		}
 	}
 }