Merge branch 'patch-4' into 'master'

BlockEffect.java : fix no method String.join, use Lang.joinHomogenous

See merge request core-developers/forge!2227
This commit is contained in:
swordshine
2019-10-07 10:30:16 +00:00

View File

@@ -12,6 +12,8 @@ import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Lang;
import java.util.*; import java.util.*;
public class BlockEffect extends SpellAbilityEffect { public class BlockEffect extends SpellAbilityEffect {
@@ -106,7 +108,7 @@ public class BlockEffect extends SpellAbilityEffect {
} }
} }
sb.append(String.join(", ", blockers)).append(" block ").append(String.join(", ", attackers)); sb.append(Lang.joinHomogenous(blockers)).append(" block ").append(Lang.joinHomogenous(attackers));
return sb.toString(); return sb.toString();
} }