Merge branch 'counterTypeNetwork' into 'master'

CounterType: needs to be serializable for Network

See merge request core-developers/forge!2852
This commit is contained in:
Michael Kamensky
2020-06-05 05:56:19 +00:00

View File

@@ -1,5 +1,6 @@
package forge.game.card;
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
@@ -10,7 +11,9 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.collect.Ordering;
public class CounterType implements Comparable<CounterType> {
public class CounterType implements Comparable<CounterType>, Serializable {
private static final long serialVersionUID = -7575835723159144478L;
private CounterEnumType eVal = null;
private String sVal = null;