Commit 997cc51a authored by Theodore Lopez's avatar Theodore Lopez

Finish last merge, still not working (important)

parent 05917060
......@@ -149,17 +149,12 @@ public class LocalGameLoop extends Thread{
e.printStackTrace();
}
if (eventToReceive instanceof MapInit) {
<<<<<<< HEAD:src/gameloop/DummyLocalGameLoop.java
GameContent gc = DummyLocalGameLoop.getInstance().getContent();
Entity e = ((MapInit) eventToReceive).getFollowedDummyEntity();
if(!(e instanceof Character)){
throw new RuntimeException("Player isn't a Character");
}
Relayer firstEntityRelayer = Relayers.addFollowedRelayer((Character) e);
=======
GameContent gc = LocalGameLoop.getInstance().getContent();
Relayer firstEntityRelayer = Relayers.addFollowedRelayer(((MapInit) eventToReceive).getFollowedDummyEntity());
>>>>>>> 2e4aff744d47452287559898655bf326f6c9597c:src/gameloop/LocalGameLoop.java
setFollowedRelayer(firstEntityRelayer);
relayerSemaphore.release();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment