From 788271ff3d9534142ca77b5f30b7a98f0bfc7ce6 Mon Sep 17 00:00:00 2001
From: jslightham <31053827+jslightham@users.noreply.github.com>
Date: Fri, 31 May 2019 19:57:43 -0400
Subject: [PATCH] fixed enemy bug

---
 data/enemies.dat                   |  2 +-
 src/com/bayviewglen/zork/Game.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/data/enemies.dat b/data/enemies.dat
index 9a6e5f3..668d236 100644
--- a/data/enemies.dat
+++ b/data/enemies.dat
@@ -1,6 +1,6 @@
 Enemy Name: Henry Pellatt
 Description: The owner of the Castle 
-Starting Room: Circle Room
+Starting Room: Apple Hallway
 Damage Given: 25
 Loot: Crowbar
 Enemy Name: Lady Pellatt
diff --git a/src/com/bayviewglen/zork/Game.java b/src/com/bayviewglen/zork/Game.java
index 1a975b9..f8345b4 100644
--- a/src/com/bayviewglen/zork/Game.java
+++ b/src/com/bayviewglen/zork/Game.java
@@ -162,10 +162,12 @@ class Game {
 				// Read the Loot
 				String loot = enemyScanner.nextLine().split(":")[1].trim();
 				e.setLoot(loot);
+				masterEnemyMap.put(e, e.getRoom());
 				}
 			}catch(Exception ex) {
 			}
-			masterEnemyMap.put(e, e.getRoom());
+			
+			
 			enemyScanner.close();
 		} 
 
@@ -295,11 +297,17 @@ class Game {
 					nextRoom.setLocked(false);
 					player.removeFromInventory(new Lockpick());
 					System.out.println("After a little bit of picking, a click is heard and the door opens slightly!");
+					if(!nextRoom.getBoarded())
+						break;
 				}else{
 					System.out.println("That door is already unlocked!");
+					if(!nextRoom.getBoarded())
+						break;
 				}
 				}catch(Exception e) {
 					System.out.println("There is no door there!");
+					if(!nextRoom.getBoarded())
+						break;
 				}
 			}else if(!command.hasDirection()){
 				System.out.println("In what direction do you want to go in?");