Merge branch 'fixDraw' into 'master'

Fix NPE when targeting different players hidden zone

See merge request core-developers/forge!4292
This commit is contained in:
Bug Hunter
2021-03-28 07:08:44 +00:00

View File

@@ -1179,7 +1179,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
} }
for (Player player : fetchers) { for (Player player : HiddenOriginChoicesMap.keySet()) {
boolean searchedLibrary = HiddenOriginChoicesMap.get(player).searchedLibrary; boolean searchedLibrary = HiddenOriginChoicesMap.get(player).searchedLibrary;
boolean shuffleMandatory = HiddenOriginChoicesMap.get(player).shuffleMandatory; boolean shuffleMandatory = HiddenOriginChoicesMap.get(player).shuffleMandatory;
CardCollection chosenCards = HiddenOriginChoicesMap.get(player).chosenCards; CardCollection chosenCards = HiddenOriginChoicesMap.get(player).chosenCards;