Merge branch 'master' of https://github.com/TeamGarbo/eye-of-tyche

mallocc · mallocc · commit 7c85541fd93d · 2018-05-06T07:37:59.000+01:00
diff --git a/app/src/main/java/teamgarbo/github/io/eyeoftyche/Engine/World.java b/app/src/main/java/teamgarbo/github/io/eyeoftyche/Engine/World.java
@@ -19,6 +19,7 @@ public class World {
     {
         this.seed = seed;
         currentRoom = new Room("Your house.", 10, 0,1,1,false, seed);
+        currentRoom.setMobList(getMobs());
     }
 
     ArrayList<Room> getRooms()

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public class World {`
`19`	`19`	`{`
`20`	`20`	`this.seed = seed;`
`21`	`21`	`currentRoom = new Room("Your house.", 10, 0,1,1,false, seed);`
	`22`	`+ currentRoom.setMobList(getMobs());`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`ArrayList<Room> getRooms()`