From c59cd875b8d14c1e4c19dfc3c9d0f0d147ebd632 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 25 Feb 2021 22:12:23 +0100 Subject: [PATCH] Fix crash for triggers with no description --- forge-gui/res/cardsfolder/c/canyon_jerboa.txt | 2 +- .../src/main/java/forge/player/PlayerControllerHuman.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/c/canyon_jerboa.txt b/forge-gui/res/cardsfolder/c/canyon_jerboa.txt index c476f8f0e4c..01a59242c64 100644 --- a/forge-gui/res/cardsfolder/c/canyon_jerboa.txt +++ b/forge-gui/res/cardsfolder/c/canyon_jerboa.txt @@ -2,7 +2,7 @@ Name:Canyon Jerboa ManaCost:2 W Types:Creature Mouse PT:1/2 -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ DBPumpAll | Landfall — Whenever a land enters the battlefield under your control, creatures you control get +1/+1 until end of turn. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ DBPumpAll | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, creatures you control get +1/+1 until end of turn. SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 SVar:BuffedBy:Land Oracle:Landfall — Whenever a land enters the battlefield under your control, creatures you control get +1/+1 until end of turn. diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 201f0d30ba8..38c3dcc87b6 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1726,7 +1726,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont // for the purpose of pre-ordering, no need for extra granularity Integer idxAdditionalInfo = firstStr.indexOf(" ["); - StringBuilder saLookupKey = new StringBuilder(idxAdditionalInfo != -1 ? firstStr.substring(0, idxAdditionalInfo - 1) : firstStr); + StringBuilder saLookupKey = new StringBuilder(idxAdditionalInfo > 0 ? firstStr.substring(0, idxAdditionalInfo - 1) : firstStr); char delim = (char) 5; for (int i = 1; i < activePlayerSAs.size(); i++) { @@ -1744,7 +1744,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont saLookupKey.append(delim).append(saStr); idxAdditionalInfo = saLookupKey.indexOf(" ["); - if (idxAdditionalInfo != -1) { + if (idxAdditionalInfo > 0) { saLookupKey = new StringBuilder(saLookupKey.substring(0, idxAdditionalInfo - 1)); } }