1 files changed, 10 insertions, 33 deletions

diff --git a/src/esieequest/model/entities/Player.java b/src/esieequest/model/entities/Player.java
index ef47d3f..5a97726 100644
--- a/src/esieequest/model/entities/Player.java
+++ b/src/esieequest/model/entities/Player.java
@@ -1,25 +1,22 @@
 package esieequest.model.entities;
 
-import java.util.HashMap;
-import java.util.Set;
 import java.util.Stack;
 
 import esieequest.model.items.Inventory;
-import esieequest.model.items.Item;
 import esieequest.model.map.Room;
 
-public class Player implements Inventory {
+public class Player {
 
         private Room currentRoom;
         private final Stack<Room> previousRooms;
 
-        private final HashMap<String, Item> inventory;
+        private final Inventory inventory;
 
         public Player() {
                 this.currentRoom = null;
                 this.previousRooms = new Stack<Room>();
 
-                this.inventory = new HashMap<String, Item>();
+                this.inventory = new Inventory();
         }
 
         /**
@@ -51,33 +48,13 @@ public class Player implements Inventory {
                 }
         }
 
-        @Override
-        public Item takeItem(final String itemName) {
-                final Item item = this.inventory.get(itemName);
-                this.inventory.remove(itemName);
-                return item;
-        }
-
-        @Override
-        public boolean hasItem(final String itemName) {
-                return this.inventory.get(itemName) != null;
-        }
-
-        @Override
-        public void putItem(final String itemName, final Item item) {
-                this.inventory.put(itemName, item);
-        }
-
-        @Override
-        public Set<String> getItemList() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public String listItems() {
-                // TODO Auto-generated method stub
-                return null;
+        /**
+         * Gets the player's inventory.
+         * 
+         * @return the player's inventory
+         */
+        public Inventory getInventory() {
+                return this.inventory;
         }
 
 }