diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index b7c3ec92c..f8903103f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -45,8 +45,6 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, IMatteryEn private var battery = ImpreciseFraction.ZERO private var maxBattery = ImpreciseFraction(60000) - var batteryItemStack: ItemStack = ItemStack.EMPTY - private val features = Object2ObjectArrayMap, AndroidFeature>() private val networkQueue = ArrayList() private val queuedTicks = ArrayList() @@ -63,17 +61,18 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, IMatteryEn private var invalidateNetworkIn = 10 private var remoteIsAndroid = false + var batteryItemStack: ItemStack = ItemStack.EMPTY + var willBecomeAndroid = false var isAndroid = false - var sleepTicks = 0 + val isEverAndroid: Boolean get() = isAndroid || willBecomeAndroid + var lastJumpTicks = 14 fun invalidateNetworkState() { invalidateNetworkIn = 10 } - val isEverAndroid: Boolean get() = isAndroid || willBecomeAndroid - fun becomeAndroidSoft() { if (isAndroid || willBecomeAndroid) return willBecomeAndroid = true @@ -145,8 +144,6 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, IMatteryEn return instance } - var lastJumpTicks = 14 - private fun addFeature(feature: AndroidFeature): Boolean { if (features.containsKey(feature.type)) return false features[feature.type] = feature