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

Fix some scripts (#6460)

Browse Source
This commit is contained in:
tool4ever
2024-10-29 15:17:36 +01:00
committed by GitHub
parent d4e6a67285
commit 4a08a6a4e0
16 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -1002,7 +1002,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
else if (!origin.contains(ZoneType.Library) && !origin.contains(ZoneType.Hand)
&& !sa.hasParam("DefinedPlayer")) {
fetchList = new CardCollection(player.getGame().getCardsIn(origin));
fetchList = new CardCollection(game.getCardsIn(origin));
}
else {
fetchList = new CardCollection(player.getCardsIn(origin));
@@ -1061,7 +1061,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(decider);
runParams.put(AbilityKey.Target, Lists.newArrayList(player));
decider.getGame().getTriggerHandler().runTrigger(TriggerType.SearchedLibrary, runParams, false);
game.getTriggerHandler().runTrigger(TriggerType.SearchedLibrary, runParams, false);
}
if (searchedLibrary && sa.hasParam("Searched")) {
searchedLibrary = false;

1
forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
View File

@@ -31,7 +31,6 @@ public abstract class ManifestBaseEffect extends SpellAbilityEffect {
}
protected void manifestLoop(SpellAbility sa, Player p, final int amount) {
final Card source = sa.getHostCard();
final Player activator = sa.getActivatingPlayer();
final Game game = source.getGame();

3
forge-game/src/main/java/forge/game/card/CardDamageMap.java
View File

@@ -143,7 +143,7 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
damaged.getKey().setHasBeenDealtExcessDamageThisTurn(true);
damaged.getKey().logExcessDamage(excess);
// Run triggers
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageTarget, damaged.getKey());
runParams.put(AbilityKey.DamageAmount, excess);
@@ -158,7 +158,6 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
}
if (!damagedList.isEmpty()) {
// Run triggers
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageTargets, damagedList);
runParams.put(AbilityKey.IsCombatDamage, isCombat);