github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-24 19:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync old changes

Browse source
This commit is contained in:
Oleg Agafonov 2019-03-22 21:51:26 +04:00
parent caf1a98759
commit 270ec615af
4 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mage.Client/src/main/java/mage/client/util/SoftValuesLoadingCache.java
View file

@ -9,10 +9,12 @@ import com.google.common.base.Function;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.ForwardingLoadingCache;
import com.google.common.cache.LoadingCache;
import org.apache.log4j.Logger;
public class SoftValuesLoadingCache<K, V> extends ForwardingLoadingCache<K, Optional<V>> {
private final LoadingCache<K, Optional<V>> cache;
private static final Logger logger = Logger.getLogger(SoftValuesLoadingCache.class);
public SoftValuesLoadingCache(CacheLoader<K, Optional<V>> loader) {
cache = newBuilder().softValues().build(loader);
@ -35,7 +37,14 @@ public class SoftValuesLoadingCache<K, V> extends ForwardingLoadingCache<K, Opti
try {
return get(key).orElse(null);
} catch (ExecutionException e) {
throw new RuntimeException(e);
if (e.getCause() instanceof OutOfMemoryError) {
logger.warn("Out of memory error: try to increase free memory in launcher options (-xmx param)");
return null;
} else {
throw new RuntimeException(e);
}
} catch (Throwable e) {
return null;
}
}

4
Mage.Common/src/main/java/mage/remote/SessionImpl.java
View file

@ -1539,6 +1539,10 @@ public class SessionImpl implements Session {
private void handleThrowable(Throwable t) {
logger.fatal("Communication error", t);
if (t instanceof InterruptedException) {
logger.error("Was interrupted", new Throwable());
}
// Probably this can cause hanging the client under certain circumstances as the disconnect method is synchronized
// so check if it's needed
// disconnect(true);

34
Mage.Tests/src/test/java/org/mage/test/utils/ExportJsonGameplayDataTest.java
View file

@ -25,6 +25,7 @@ import java.util.List;
public class ExportJsonGameplayDataTest {
private static final Logger logger = Logger.getLogger(ExportJsonGameplayDataTest.class);
private static final boolean MTGJSON_WRITE_TO_FILES = false;
@Test
@Ignore
@ -116,21 +117,24 @@ public class ExportJsonGameplayDataTest {
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String filePath = System.getProperty("user.dir") + "/json/" + set.getCode() + ".json";
File outputFile = new File(filePath);
final boolean mkdirs = outputFile.getParentFile().mkdirs();
try (Writer writer =
new BufferedWriter(
new OutputStreamWriter(
new FileOutputStream(outputFile, false), StandardCharsets.UTF_8
)
)
) {
writer.write(gson.toJson(res));
System.out.println("Wrote " + set.getCode() + " to file");
} catch (Exception e) {
e.printStackTrace();
if (MTGJSON_WRITE_TO_FILES) {
String filePath = System.getProperty("user.dir") + "/json/" + set.getCode() + ".json";
File outputFile = new File(filePath);
final boolean mkdirs = outputFile.getParentFile().mkdirs();
try (Writer writer =
new BufferedWriter(
new OutputStreamWriter(
new FileOutputStream(outputFile, false), StandardCharsets.UTF_8
)
)
) {
writer.write(gson.toJson(res));
System.out.println("Wrote " + set.getCode() + " to file");
} catch (Exception e) {
e.printStackTrace();
}
} else {
//System.out.println(gson.toJson(res));
}
}
}

3
Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java
View file

@ -1,4 +1,3 @@
package mage.game.permanent.token;
import mage.constants.CardType;
@ -24,6 +23,8 @@ public final class Wurm1Token extends TokenImpl {
power = new MageInt(3);
toughness = new MageInt(3);
this.addAbility(DeathtouchAbility.getInstance());
setTokenType(1); // for image
}
public Wurm1Token(final Wurm1Token token) {