mirror of
https://github.com/correl/mage.git
synced 2024-11-24 19:19:56 +00:00
Little fixes
This commit is contained in:
parent
b011ddf942
commit
ab1475d7e0
4 changed files with 10 additions and 11 deletions
|
@ -329,7 +329,6 @@ public class User {
|
|||
|
||||
private void reconnect() {
|
||||
logger.trace(userName + " started reconnect");
|
||||
//lastActivity = new Date(); // ??? comment to test can't reconnect to game on disconnect
|
||||
for (Entry<UUID, Table> entry : tables.entrySet()) {
|
||||
ccJoinedTable(entry.getValue().getRoomId(), entry.getValue().getId(), entry.getValue().isTournament());
|
||||
}
|
||||
|
|
|
@ -110,7 +110,7 @@ class OathOfMagesEffect extends OneShotEffect {
|
|||
if (sourceObject == null || firstPlayer == null) {
|
||||
return false;
|
||||
}
|
||||
if (firstPlayer.chooseUse(outcome, "Deal one damage to " + secondPlayer.getLogName() + "?", source, game)) {
|
||||
if (firstPlayer.chooseUse(Outcome.Benefit, "Deal one damage to " + secondPlayer.getLogName() + "?", source, game)) {
|
||||
secondPlayer.damage(1, source.getSourceId(), game, false, true);
|
||||
}
|
||||
return true;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
|
||||
package mage;
|
||||
|
||||
import mage.util.CardUtil;
|
||||
import mage.util.Copyable;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import mage.util.Copyable;
|
||||
|
||||
public class MageInt implements Serializable, Copyable<MageInt> {
|
||||
|
||||
public static final MageInt EmptyMageInt = new MageInt(Integer.MIN_VALUE, "") {
|
||||
|
@ -80,7 +80,7 @@ public class MageInt implements Serializable, Copyable<MageInt> {
|
|||
}
|
||||
|
||||
public void boostValue(int amount) {
|
||||
this.boostedValue += amount;
|
||||
this.boostedValue = CardUtil.addWithOverflowCheck(this.boostedValue, amount);
|
||||
}
|
||||
|
||||
public void resetToBaseValue() {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package mage.game.permanent;
|
||||
|
||||
import java.util.*;
|
||||
import mage.MageObject;
|
||||
import mage.MageObjectReference;
|
||||
import mage.ObjectColor;
|
||||
|
@ -38,6 +37,8 @@ import mage.util.GameLog;
|
|||
import mage.util.ThreadLocalStringBuilder;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
*/
|
||||
|
@ -757,7 +758,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
|
|||
this.attachedTo = attachToObjectId;
|
||||
this.attachedToZoneChangeCounter = game.getState().getZoneChangeCounter(attachToObjectId);
|
||||
for (Ability ability : this.getAbilities()) {
|
||||
for (Iterator<Effect> ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext();) {
|
||||
for (Iterator<Effect> ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext(); ) {
|
||||
ContinuousEffect effect = (ContinuousEffect) ite.next();
|
||||
game.getContinuousEffects().setOrder(effect);
|
||||
// It's important to update the timestamp of the copied effect in ContinuousEffects because it does the action
|
||||
|
@ -812,8 +813,8 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
|
|||
* @param game
|
||||
* @param preventable
|
||||
* @param combat
|
||||
* @param markDamage If true, damage will be dealt later in applyDamage
|
||||
* method
|
||||
* @param markDamage If true, damage will be dealt later in applyDamage
|
||||
* method
|
||||
* @return
|
||||
*/
|
||||
private int damage(int damageAmount, UUID sourceId, Game game, boolean preventable, boolean combat, boolean markDamage, List<UUID> appliedEffects) {
|
||||
|
@ -952,7 +953,6 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
|
|||
addCounters(CounterType.M1M1.createInstance(actualDamage), damageSourceAbility, game);
|
||||
}
|
||||
} else {
|
||||
// this.damage += actualDamage;
|
||||
this.damage = CardUtil.addWithOverflowCheck(this.damage, actualDamage);
|
||||
}
|
||||
game.fireEvent(new DamagedCreatureEvent(objectId, sourceId, controllerId, actualDamage, combat));
|
||||
|
|
Loading…
Reference in a new issue