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

prevent NPE

Browse Source
This commit is contained in:
Anthony Calosa
2023-05-25 10:17:09 +08:00
parent fc944ce41b
commit 6fc7df840d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -205,7 +205,8 @@ public abstract class Trigger extends TriggerReplacementBase {
} }
} }
if (saDesc.equals("")) { // in case we haven't found anything better 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 // string might have leading whitespace
saDesc = saDesc.trim(); saDesc = saDesc.trim();

3
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
View File

@@ -1660,7 +1660,8 @@ public class FSkin {
w0 = tempCoords[2]; w0 = tempCoords[2];
h0 = tempCoords[3]; h0 = tempCoords[3];
SkinImage.setImage(s0, bim.getSubimage(x0, y0, w0, h0)); if (bim != null)
SkinImage.setImage(s0, bim.getSubimage(x0, y0, w0, h0));
} }
/** /**