github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed EquipmentAttachedCount. Fixed Kemba, Kha Regent not working

Browse source
This commit is contained in:
magenoxx 2012-06-29 12:03:08 +04:00
parent 900086fffc
commit 6e3ee0e6fe
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java
View file

@ -58,19 +58,15 @@ public class EquipmentAttachedCount implements DynamicValue {
@Override @Override
public int calculate(Game game, Ability source) { public int calculate(Game game, Ability source) {
int count = 0; int count = 0;
Permanent equipment = game.getPermanent(source.getSourceId()); Permanent permanent = game.getPermanent(source.getSourceId()); // don't change this - may affect other cards
if (equipment != null) { if (permanent != null) {
Permanent permanent = game.getPermanent(equipment.getAttachedTo());
if (permanent != null) {
List<UUID> attachments = permanent.getAttachments(); List<UUID> attachments = permanent.getAttachments();
for (UUID attachmentId : attachments) { for (UUID attachmentId : attachments) {
Permanent attached = game.getPermanent(attachmentId); Permanent attached = game.getPermanent(attachmentId);
if (attached != null && attached.getSubtype().contains("Equipment")) { if (attached != null && attached.getSubtype().contains("Equipment")) {
count++; count++;
}
} }
} }
} }
return amount * count; return amount * count;
} }

2
Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
View file

@ -62,7 +62,7 @@ public class CreateTokenEffect extends OneShotEffect<CreateTokenEffect> {
public CreateTokenEffect(final CreateTokenEffect effect) { public CreateTokenEffect(final CreateTokenEffect effect) {
super(effect); super(effect);
this.amount = effect.amount; this.amount = effect.amount.clone();
this.token = effect.token.copy(); this.token = effect.token.copy();
} }