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

Check for new trigger

Browse Source
This commit is contained in:
tool4EvEr
2024-07-29 12:04:26 +02:00
committed by Hans Mackowiak
parent 23d0b05547
commit fdd490030f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,6 @@ public class CardCopyService {
} }
} }
// ======================================================== // ========================================================
// LKI functions // LKI functions
@@ -186,7 +185,6 @@ public class CardCopyService {
return new CardCopyService(c).getLKICopy(cachedMap); return new CardCopyService(c).getLKICopy(cachedMap);
} }
public static GameEntity getLKICopy(final GameEntity c, Map<Integer, Card> cachedMap) { public static GameEntity getLKICopy(final GameEntity c, Map<Integer, Card> cachedMap) {
// Ideally, we'd just convert all calls to getLKICopy to use the Map version // Ideally, we'd just convert all calls to getLKICopy to use the Map version
if (c instanceof Card) { if (c instanceof Card) {
@@ -408,5 +406,4 @@ public class CardCopyService {
return newCopy; return newCopy;
} }
} }

2
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -242,8 +242,8 @@ public class TriggerHandler {
for (final Trigger t : c.getTriggers()) { for (final Trigger t : c.getTriggers()) {
if ( if (
TriggerType.Exploited.equals(t.getMode()) || TriggerType.Exploited.equals(t.getMode()) ||
TriggerType.Sacrificed.equals(t.getMode()) ||
TriggerType.Destroyed.equals(t.getMode()) || TriggerType.Destroyed.equals(t.getMode()) ||
TriggerType.Sacrificed.equals(t.getMode()) || TriggerType.SacrificedOnce.equals(t.getMode()) ||
((TriggerType.ChangesZone.equals(t.getMode()) || TriggerType.ChangesZoneAll.equals(t.getMode())) ((TriggerType.ChangesZone.equals(t.getMode()) || TriggerType.ChangesZoneAll.equals(t.getMode()))
&& "Battlefield".equals(t.getParam("Origin")))) { // TODO needs additional logic in case origin=Any && "Battlefield".equals(t.getParam("Origin")))) { // TODO needs additional logic in case origin=Any
registerOneTrigger(t); registerOneTrigger(t);