Merge pull request #1483 from kellyelton/master

kellyelton · kellyelton · commit 1a4f08d50b14 · 2015-06-30T16:48:55.000-05:00
Fixed cards face up being messed up after reconnect
diff --git a/octgnFX/Octgn/Play/State/GameSaveState.cs b/octgnFX/Octgn/Play/State/GameSaveState.cs
@@ -179,7 +179,7 @@ public override CardSaveState Create(Play.Card card, Play.Player fromPlayer)
             this.Id = card.Id;
 			this.Type = card.Type.Model.Id;
             this.Index = card.GetIndex();
-            this.FaceUp = card.FaceUp;
+            this.FaceUp = ((card.FaceUp && card.Group.Viewers.Contains(fromPlayer)) || (card.Group.Viewers.Contains(fromPlayer)) || card.IsVisibleToAll());
             X = card.X;
             Y = card.Y;
 
diff --git a/recentchanges.txt b/recentchanges.txt
@@ -1 +1 @@
-
+Fixed cards face up being messed up after reconnect - Kelly

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-`
	`1`	`+Fixed cards face up being messed up after reconnect - Kelly`