X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Factions%2Fuseitem%2FUseWaterBucketAction.kt;h=739ec2899335130d1b9daae1e3c2f14db5b8e991;hb=456e76ce31c05500ab7d9e78e2b02019143929a4;hp=596d5872950fcde8343f45e27e61c4a862a4537a;hpb=121928e90bdfa3a9d9c8bd708b9f8da28d3807c0;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt b/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt index 596d587..739ec28 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt @@ -5,9 +5,11 @@ import ru.deadsoftware.cavedroid.game.GameScope import ru.deadsoftware.cavedroid.game.mobs.MobsController import ru.deadsoftware.cavedroid.game.model.item.Item import ru.deadsoftware.cavedroid.game.world.GameWorld +import ru.deadsoftware.cavedroid.misc.annotations.multibinding.BindUseItemAction import javax.inject.Inject @GameScope +@BindUseItemAction(UseWaterBucketAction.ACTION_KEY) class UseWaterBucketAction @Inject constructor( private val gameWorld: GameWorld, private val mobsController: MobsController, @@ -16,7 +18,9 @@ class UseWaterBucketAction @Inject constructor( override fun perform(item: Item.Usable, x: Int, y: Int) { gameWorld.placeToForeground(x, y, gameItemsHolder.getBlock("water")) - mobsController.player.setCurrentInventorySlotItem(gameItemsHolder.getItem("bucket_empty")) + if (mobsController.player.gameMode != 1) { + mobsController.player.setCurrentInventorySlotItem(gameItemsHolder.getItem("bucket_empty")) + } } companion object {