Merge branch 'master' into 'master'

Restore the "move equipment" functionality for the AI

See merge request core-developers/forge!1216
This commit is contained in:
Michael Kamensky
2018-12-12 18:57:00 +00:00

View File

@@ -1316,7 +1316,8 @@ public class AttachAi extends SpellAbilityAi {
} }
// Don't fortify if already fortifying // Don't fortify if already fortifying
if (attachSource.getAttachedTo() != null && attachSource.getAttachedTo().getController() == aiPlayer) { if (attachSource.isFortification() && attachSource.getAttachedTo() != null
&& attachSource.getAttachedTo().getController() == aiPlayer) {
return null; return null;
} }