Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Add tests for Camellia, refactor SacrificedPermanentBatchEvent. (#12769)

Browse source 
Added SacrificedPermanentEvent, to be used in SacrificedPermanentBatchEvent to prevent adding incorrect GameEvents.
This commit is contained in:
Grath 2024-08-31 16:42:24 -04:00 • committed by GitHub
parent e290bc8c1a
commit 6a19ec48df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 113 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/game/GameState.java
View file

@ -930,21 +930,21 @@ public class GameState implements Serializable, Copyable<GameState> {
}
}
public void addSimultaneousSacrificedPermanentToBatch(GameEvent sacrificedEvent, Game game) {
public void addSimultaneousSacrificedPermanentToBatch(SacrificedPermanentEvent sacrificedPermanentEvent, Game game) {
// Combine multiple sacrificed permanent events in the single event (batch)
// existing batch
boolean isBatchUsed = false;
for (GameEvent event : simultaneousEvents) {
if (event instanceof SacrificedPermanentBatchEvent) {
((SacrificedPermanentBatchEvent) event).addEvent(sacrificedEvent);
((SacrificedPermanentBatchEvent) event).addEvent(sacrificedPermanentEvent);
isBatchUsed = true;
}
}
// new batch
if (!isBatchUsed) {
addSimultaneousEvent(new SacrificedPermanentBatchEvent(sacrificedEvent), game);
addSimultaneousEvent(new SacrificedPermanentBatchEvent(sacrificedPermanentEvent), game);
}
}