From da52bc17e873f5ca74f7bcf8ed640c9bd782d1b9 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Mon, 22 Sep 2025 16:16:57 +0200
Subject: [PATCH] GameEventAttachment: flip oldTarget and newTarget param
 (#8761)

* GameEventAttachment: flip oldTarget and newTarget param

---------

Co-authored-by: tool4EvEr <tool4EvEr@>
---
 forge-game/src/main/java/forge/game/GameEntity.java            | 3 ---
 .../main/java/forge/game/event/GameEventCardAttachment.java    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameEntity.java b/forge-game/src/main/java/forge/game/GameEntity.java
index fabfe363313..7e51c00234f 100644
--- a/forge-game/src/main/java/forge/game/GameEntity.java
+++ b/forge-game/src/main/java/forge/game/GameEntity.java
@@ -34,7 +34,6 @@ import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CounterType;
-import forge.game.event.GameEventCardAttachment;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
@@ -196,14 +195,12 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
     public final void addAttachedCard(final Card c) {
         if (attachedCards.add(c)) {
             updateAttachedCards();
-            getGame().fireEvent(new GameEventCardAttachment(c, null, this));
         }
     }
 
     public final void removeAttachedCard(final Card c) {
         if (attachedCards.remove(c)) {
             updateAttachedCards();
-            getGame().fireEvent(new GameEventCardAttachment(c, this, null));
         }
     }
 
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java b/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
index 4430a9f9357..c6acf10358b 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
@@ -3,7 +3,7 @@ package forge.game.event;
 import forge.game.GameEntity;
 import forge.game.card.Card;
 
-public record GameEventCardAttachment(Card equipment, GameEntity newTarget, GameEntity oldEntity) implements GameEvent {
+public record GameEventCardAttachment(Card equipment, GameEntity oldEntity, GameEntity newTarget) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {