From 6fc7df840dd78ebb58e35de1aa69f76f37683760 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 25 May 2023 10:17:09 +0800 Subject: [PATCH] prevent NPE --- forge-game/src/main/java/forge/game/trigger/Trigger.java | 3 ++- forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index 871df609cdc..7afe726a2b1 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -205,7 +205,8 @@ public abstract class Trigger extends TriggerReplacementBase { } } if (saDesc.equals("")) { // in case we haven't found anything better - saDesc = sa.toString(); + if (sa != null) + saDesc = sa.toString(); } // string might have leading whitespace saDesc = saDesc.trim(); diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java index 0c254d62dc1..3a20233e0e4 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -1660,7 +1660,8 @@ public class FSkin { w0 = tempCoords[2]; h0 = tempCoords[3]; - SkinImage.setImage(s0, bim.getSubimage(x0, y0, w0, h0)); + if (bim != null) + SkinImage.setImage(s0, bim.getSubimage(x0, y0, w0, h0)); } /**