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

Merge branch 'sentryKeyword' into 'master'

Browse Source 
Sentry keyword

See merge request core-developers/forge!910
This commit is contained in:
Jamin Collins
2018-09-12 01:13:42 +00:00
parent 9e0a4ded01 998176a7d7
commit d011f9948d
8 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/.project
View File

@@ -3,6 +3,7 @@
<name>forge-ai</name>
<comment></comment>
<projects>
<project>forge-game</project>
</projects>
<buildSpec>
<buildCommand>

1
forge-core/.classpath
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

5
forge-game/pom.xml
View File

@@ -30,5 +30,10 @@
<scope>test</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry-log4j</artifactId>
<version>1.7.5</version>
</dependency>
</dependencies>
</project>

16
forge-game/src/main/java/forge/game/keyword/KeywordInstance.java
View File

@@ -14,6 +14,8 @@ import forge.game.spellability.SpellAbility;
import forge.game.staticability.StaticAbility;
import forge.game.trigger.Trigger;
import forge.util.Lang;
import io.sentry.Sentry;
import io.sentry.event.BreadcrumbBuilder;
public abstract class KeywordInstance<T extends KeywordInstance<?>> implements KeywordInterface {
private Keyword keyword;
@@ -92,10 +94,24 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
abilities.clear();
staticAbilities.clear();
}
String msg = "KeywordInstance:createTraits: make Traits for Keyword";
Sentry.getContext().recordBreadcrumb(
new BreadcrumbBuilder().setMessage(msg)
.withData("Card", host.getName()).withData("Keyword", this.original).build()
);
// add Extra for debugging
Sentry.getContext().addExtra("Card", host);
Sentry.getContext().addExtra("Keyword", this.original);
CardFactoryUtil.addTriggerAbility(this, host, intrinsic);
CardFactoryUtil.addReplacementEffect(this, host, intrinsic);
CardFactoryUtil.addSpellAbility(this, host, intrinsic);
CardFactoryUtil.addStaticAbility(this, host, intrinsic);
// remove added extra
Sentry.getContext().removeExtra("Card");
Sentry.getContext().removeExtra("Keyword");
}
/*

16
forge-gui-desktop/.classpath
View File

@@ -1,9 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/forge-gui"/>
<classpathentry combineaccessrules="false" kind="src" path="/forge-ai"/>
<classpathentry combineaccessrules="false" kind="src" path="/forge-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/forge-game"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

3
forge-gui-desktop/.project
View File

@@ -3,6 +3,9 @@
<name>forge-gui-desktop</name>
<comment></comment>
<projects>
<project>forge-core</project>
<project>forge-game</project>
<project>forge-gui</project>
</projects>
<buildSpec>
<buildCommand>

1
forge-gui/.classpath
View File

@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

5
forge-gui/pom.xml
View File

@@ -67,11 +67,6 @@
<artifactId>cling-support</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry-log4j</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>