From 4deff44f76ec577dc4969b0c7b483abd7ca4b113 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 14 Aug 2024 06:40:45 +0800 Subject: [PATCH] remove hint --- .../forge/game/ability/effects/ManaEffect.java | 5 +---- .../src/main/java/forge/game/card/Card.java | 9 ++------- .../java/forge/game/card/CardCopyService.java | 5 +---- .../java/forge/game/card/CardFactoryUtil.java | 5 +---- .../main/java/forge/game/card/CardState.java | 5 +---- .../forge/game/keyword/KeywordInstance.java | 17 ++++------------- .../java/forge/game/trigger/TriggerHandler.java | 9 ++------- 7 files changed, 12 insertions(+), 43 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java index d3ccfa091da..45c4fe55e23 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import forge.util.Lang; -import io.sentry.Hint; import org.apache.commons.lang3.StringUtils; import forge.card.ColorSet; @@ -241,9 +240,7 @@ public class ManaEffect extends SpellAbilityEffect { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", card.getName()); bread.setData("SA", sa.toString()); - Hint hint = new Hint(); - hint.set(sa.toString(), sa); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); continue; } diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 8ff9161e9c2..fab641587f6 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -56,7 +56,6 @@ import forge.util.*; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; import io.sentry.Breadcrumb; -import io.sentry.Hint; import io.sentry.Sentry; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableBoolean; @@ -2614,9 +2613,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", this.getName()); bread.setData("Keyword", keyword); - Hint hint = new Hint(); - hint.set(this.getName(), this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); throw new RuntimeException("Error in Card " + this.getName() + " with Keyword " + keyword, e); } @@ -3187,9 +3184,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", this.getName()); bread.setData("Keyword", keyword); - Hint hint = new Hint(); - hint.set(this.getName(), this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); throw new RuntimeException("Error in Card " + this.getName() + " with Keyword " + keyword, e); } diff --git a/forge-game/src/main/java/forge/game/card/CardCopyService.java b/forge-game/src/main/java/forge/game/card/CardCopyService.java index 0b7b45491db..30a48c31163 100644 --- a/forge-game/src/main/java/forge/game/card/CardCopyService.java +++ b/forge-game/src/main/java/forge/game/card/CardCopyService.java @@ -10,7 +10,6 @@ import forge.game.ability.ApiType; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import io.sentry.Breadcrumb; -import io.sentry.Hint; import io.sentry.Sentry; import java.util.List; @@ -215,9 +214,7 @@ public class CardCopyService { bread.setData("Card", copyFrom.getName()); bread.setData("CardState", copyFrom.getCurrentStateName().toString()); bread.setData("Player", copyFrom.getController().getName()); - Hint hint = new Hint(); - hint.set(copyFrom.getName(), copyFrom); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); final Card newCopy = new Card(copyFrom.getId(), copyFrom.getPaperCard(), copyFrom.getGame(), null); cachedMap.put(copyFrom.getId(), newCopy); diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 4e8ae55d172..741a9496bd4 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -51,7 +51,6 @@ import forge.util.Localizer; import forge.util.TextUtil; import io.sentry.Breadcrumb; import io.sentry.Sentry; -import io.sentry.Hint; import org.apache.commons.lang3.StringUtils; import java.util.*; @@ -543,9 +542,7 @@ public class CardFactoryUtil { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", card.getName()); bread.setData("Ability", rawAbility); - Hint hint = new Hint(); - hint.set(card.getName(), card); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); // rethrow the exception with card Name for the user throw new RuntimeException("crash in raw Ability, check card script of " + card.getName(), e); diff --git a/forge-game/src/main/java/forge/game/card/CardState.java b/forge-game/src/main/java/forge/game/card/CardState.java index 5d45082881f..489fb917440 100644 --- a/forge-game/src/main/java/forge/game/card/CardState.java +++ b/forge-game/src/main/java/forge/game/card/CardState.java @@ -50,7 +50,6 @@ import forge.game.trigger.Trigger; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; import io.sentry.Breadcrumb; -import io.sentry.Hint; import io.sentry.Sentry; public class CardState extends GameObject implements IHasSVars { @@ -304,9 +303,7 @@ public class CardState extends GameObject implements IHasSVars { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", card.getName()); bread.setData("Keyword", s); - Hint hint = new Hint(); - hint.set(this.name, this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); //rethrow throw new RuntimeException("Error in Keyword " + s + " for card " + card.getName(), e); diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java b/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java index 6f9aaee18a1..ddf50034acc 100644 --- a/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java +++ b/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java @@ -17,7 +17,6 @@ import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; import forge.util.Lang; import io.sentry.Breadcrumb; -import io.sentry.Hint; import io.sentry.Sentry; public abstract class KeywordInstance> implements KeywordInterface { @@ -107,9 +106,7 @@ public abstract class KeywordInstance> implements K Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", host.getName()); bread.setData("Keyword", this.original); - Hint hint = new Hint(); - hint.set(this.original, this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); // add Extra for debugging Sentry.setExtra("Card", host.getName()); @@ -125,9 +122,7 @@ public abstract class KeywordInstance> implements K Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", host.getName()); bread.setData("Keyword", this.original); - Hint hint = new Hint(); - hint.set(this.original, this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); //rethrow throw new RuntimeException("Error in Keyword " + this.original + " for card " + host.getName(), e); @@ -162,9 +157,7 @@ public abstract class KeywordInstance> implements K Breadcrumb bread = new Breadcrumb(msg); bread.setData("Player", player.getName()); bread.setData("Keyword", this.original); - Hint hint = new Hint(); - hint.set(this.original, this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); // add Extra for debugging Sentry.setExtra("Player", player.getName()); @@ -180,9 +173,7 @@ public abstract class KeywordInstance> implements K Breadcrumb bread = new Breadcrumb(msg); bread.setData("Player", player.getName()); bread.setData("Keyword", this.original); - Hint hint = new Hint(); - hint.set(this.original, this); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); //rethrow throw new RuntimeException("Error in Keyword " + this.original + " for player " + player.getName(), e); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index b5a730d174e..fabd8c74c07 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -43,7 +43,6 @@ import forge.game.zone.ZoneType; import forge.util.FileSection; import forge.util.Visitor; import io.sentry.Breadcrumb; -import io.sentry.Hint; import io.sentry.Sentry; public class TriggerHandler { @@ -136,9 +135,7 @@ public class TriggerHandler { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", host.getName()); bread.setData("Trigger", trigParse); - Hint hint = new Hint(); - hint.set(host.getName(), host); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); //rethrow throw new RuntimeException("Error in Trigger for Card: " + host.getName(), e); @@ -166,9 +163,7 @@ public class TriggerHandler { Breadcrumb bread = new Breadcrumb(msg); bread.setData("Card", host.getName()); bread.setData("Params", mapParams.toString()); - Hint hint = new Hint(); - hint.set(host.getName(), host); - Sentry.addBreadcrumb(bread, hint); + Sentry.addBreadcrumb(bread); //rethrow throw new RuntimeException("Error in Trigger for Card: " + host.getName(), e);