X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FMob.java;h=3ee37d37e626914cef7b41e55c151c42ec743c3b;hb=3a443514027417133d7a7e18766720dfea028a87;hp=0f3610b61c36d0d516c744d7158abfa348a5fbd5;hpb=76a3b56287b1262f78f3b43a4aac5660338d67ad;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java index 0f3610b..3ee37d3 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java @@ -7,22 +7,20 @@ import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Timer; +import org.jetbrains.annotations.Nullable; import ru.deadsoftware.cavedroid.game.GameItemsHolder; import ru.deadsoftware.cavedroid.game.model.dto.SaveDataDto; import ru.deadsoftware.cavedroid.game.model.item.InventoryItem; -import ru.deadsoftware.cavedroid.game.model.item.Item; import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.Saveable; -import javax.annotation.CheckForNull; -import java.io.Serializable; import java.util.Collections; import java.util.List; /** * Mob class. */ -public abstract class Mob extends Rectangle implements Serializable, Saveable { +public abstract class Mob extends Rectangle implements Saveable { private static final float DAMAGE_TINT_TIMEOUT_S = 0.5f; private static final Color DAMAGE_TINT_COLOR = new Color(0xff8080ff); @@ -85,8 +83,10 @@ public abstract class Mob extends Rectangle implements Serializable, Saveable { protected int mMaxHealth; protected int mHealth; - private transient boolean mTakingDamage = false; - @CheckForNull private transient ResetTakeDamageTask mResetTakeDamageTask = null; + private boolean mTakingDamage = false; + + @Nullable + private ResetTakeDamageTask mResetTakeDamageTask = null; /** * @param x in pixels