Fixes merge issue. (overengineering#18)

LeeARichardson · Apr 18, 2018 · 8966075 · 8966075
1 parent c6534bf
commit 8966075
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/Sharpasonne/GameActions/EngineState.cs b/Sharpasonne/GameActions/EngineState.cs
@@ -7,13 +7,17 @@ namespace Sharpasonne.GameActions
 {
     public class EngineState : IEngine
     {
-        public EngineState(Board board, IImmutableDictionary<Type, IImmutableList<IRule<IGameAction>>> rules)
+        public EngineState(Board board, IEngine engine)
         {
-            Board = board;
-            Rules = rules;
+            this.Board             = board;
+            this.Rules             = engine.Rules;
+            this.Players           = engine.Players;
+            this.CurrentPlayerTurn = engine.CurrentPlayerTurn;
         }
 
-        public Board                                                          Board { get; }
-        public IImmutableDictionary<Type, IImmutableList<IRule<IGameAction>>> Rules { get; }
+        public Board                                                          Board             { get; }
+        public Players                                                        Players           { get; }
+        public int                                                            CurrentPlayerTurn { get; }
+        public IImmutableDictionary<Type, IImmutableList<IRule<IGameAction>>> Rules             { get; }
     }
 }
diff --git a/Sharpasonne/GameActions/PlaceTileGameAction.cs b/Sharpasonne/GameActions/PlaceTileGameAction.cs
@@ -19,20 +19,4 @@ public IEngine Perform(IEngine engine)
             return new EngineState(board, engine);
         }
     }
-
-    public class EngineState : IEngine
-    {
-        public EngineState(Board board, IEngine engine)
-        {
-            this.Board = board;
-            this.Rules = engine.Rules;
-            this.Players = engine.Players;
-            this.CurrentPlayerTurn = engine.CurrentPlayerTurn;
-        }
-
-        public Board Board { get; }
-        public Players Players { get; }
-        public int CurrentPlayerTurn { get; }
-        public IImmutableDictionary<Type, IImmutableList<IRule<IGameAction>>> Rules { get; }
-    }
 }