mirrors
/
PretendYoureXyzzy
mirror of https://github.com/ajanata/PretendYoureXyzzy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop tracking dealt cards in the server, as this is not actually used.

This commit is contained in:
uecasm 2013-11-15 23:11:26 +13:00
parent 7e7be6c54e
commit 0e44812f4b
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/socialgamer/cah/data/BlackDeck.java
View File

@ -26,7 +26,6 @@ package net.socialgamer.cah.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -43,7 +42,6 @@ import net.socialgamer.cah.db.CardSet;
*/ */
public class BlackDeck { public class BlackDeck {
private final List<BlackCard> deck; private final List<BlackCard> deck;
private final List<BlackCard> dealt;
private final List<BlackCard> discard; private final List<BlackCard> discard;
/** /**
@ -56,7 +54,6 @@ public class BlackDeck {
} }
deck = new ArrayList<BlackCard>(allCards); deck = new ArrayList<BlackCard>(allCards);
Collections.shuffle(deck); Collections.shuffle(deck);
dealt = new LinkedList<BlackCard>();
discard = new ArrayList<BlackCard>(deck.size()); discard = new ArrayList<BlackCard>(deck.size());
} }
@ -73,7 +70,6 @@ public class BlackDeck {
} }
// we have an ArrayList here, so this is faster // we have an ArrayList here, so this is faster
final BlackCard card = deck.remove(deck.size() - 1); final BlackCard card = deck.remove(deck.size() - 1);
dealt.add(card);
return card; return card;
} }

4
src/net/socialgamer/cah/data/WhiteDeck.java
View File

@ -26,7 +26,6 @@ package net.socialgamer.cah.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -43,7 +42,6 @@ import net.socialgamer.cah.db.WhiteCard;
*/ */
public class WhiteDeck { public class WhiteDeck {
private final List<WhiteCard> deck; private final List<WhiteCard> deck;
private final List<WhiteCard> dealt;
private final List<WhiteCard> discard; private final List<WhiteCard> discard;
/** /**
@ -56,7 +54,6 @@ public class WhiteDeck {
} }
deck = new ArrayList<WhiteCard>(allCards); deck = new ArrayList<WhiteCard>(allCards);
Collections.shuffle(deck); Collections.shuffle(deck);
dealt = new LinkedList<WhiteCard>();
discard = new ArrayList<WhiteCard>(deck.size()); discard = new ArrayList<WhiteCard>(deck.size());
} }
@ -73,7 +70,6 @@ public class WhiteDeck {
} }
// we have an ArrayList here, so this is faster // we have an ArrayList here, so this is faster
final WhiteCard card = deck.remove(deck.size() - 1); final WhiteCard card = deck.remove(deck.size() - 1);
dealt.add(card);
return card; return card;
} }