From 0e44812f4bb99a8fbd85d244c9beb0140c8241c8 Mon Sep 17 00:00:00 2001 From: uecasm Date: Fri, 15 Nov 2013 23:11:26 +1300 Subject: [PATCH] Stop tracking dealt cards in the server, as this is not actually used. --- src/net/socialgamer/cah/data/BlackDeck.java | 4 ---- src/net/socialgamer/cah/data/WhiteDeck.java | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/net/socialgamer/cah/data/BlackDeck.java b/src/net/socialgamer/cah/data/BlackDeck.java index 283e14a..f0c357b 100644 --- a/src/net/socialgamer/cah/data/BlackDeck.java +++ b/src/net/socialgamer/cah/data/BlackDeck.java @@ -26,7 +26,6 @@ package net.socialgamer.cah.data; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -43,7 +42,6 @@ import net.socialgamer.cah.db.CardSet; */ public class BlackDeck { private final List deck; - private final List dealt; private final List discard; /** @@ -56,7 +54,6 @@ public class BlackDeck { } deck = new ArrayList(allCards); Collections.shuffle(deck); - dealt = new LinkedList(); discard = new ArrayList(deck.size()); } @@ -73,7 +70,6 @@ public class BlackDeck { } // we have an ArrayList here, so this is faster final BlackCard card = deck.remove(deck.size() - 1); - dealt.add(card); return card; } diff --git a/src/net/socialgamer/cah/data/WhiteDeck.java b/src/net/socialgamer/cah/data/WhiteDeck.java index 3c92b96..32f1d12 100644 --- a/src/net/socialgamer/cah/data/WhiteDeck.java +++ b/src/net/socialgamer/cah/data/WhiteDeck.java @@ -26,7 +26,6 @@ package net.socialgamer.cah.data; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -43,7 +42,6 @@ import net.socialgamer.cah.db.WhiteCard; */ public class WhiteDeck { private final List deck; - private final List dealt; private final List discard; /** @@ -56,7 +54,6 @@ public class WhiteDeck { } deck = new ArrayList(allCards); Collections.shuffle(deck); - dealt = new LinkedList(); discard = new ArrayList(deck.size()); } @@ -73,7 +70,6 @@ public class WhiteDeck { } // we have an ArrayList here, so this is faster final WhiteCard card = deck.remove(deck.size() - 1); - dealt.add(card); return card; }