external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed addChangedCardKeywords overwriting entries with same timestamp.

Browse Source
This commit is contained in:
Sloth
2013-04-17 15:55:01 +00:00
parent dbcb86c62d
commit 5a7874f758
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/forge/Card.java
View File

@@ -4204,6 +4204,19 @@ public class Card extends GameEntity implements Comparable<Card> {
public final void addChangedCardKeywords(final ArrayList<String> keywords, final ArrayList<String> removeKeywords,
final boolean removeAllKeywords, final long timestamp) {
// if the key already exists - merge entries
if (changedCardKeywords.containsKey(timestamp)) {
ArrayList<String> kws = keywords;
ArrayList<String> rkws = removeKeywords;
boolean remAll = removeAllKeywords;
CardKeywords cks = changedCardKeywords.get(timestamp);
kws.addAll(cks.getKeywords());
rkws.addAll(cks.getRemoveKeywords());
remAll |= cks.isRemoveAllKeywords();
this.changedCardKeywords.put(timestamp, new CardKeywords(kws, rkws, remAll));
return;
}
this.changedCardKeywords.put(timestamp, new CardKeywords(keywords, removeKeywords, removeAllKeywords));
}
@@ -4221,8 +4234,8 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final void addChangedCardKeywords(final String[] keywords, final String[] removeKeywords,
final boolean removeAllKeywords, final long timestamp) {
ArrayList<String> keywordsList = null;
ArrayList<String> removeKeywordsList = null;
ArrayList<String> keywordsList = new ArrayList<String>();
ArrayList<String> removeKeywordsList = new ArrayList<String>();
if (keywords != null) {
keywordsList = new ArrayList<String>(Arrays.asList(keywords));
}