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=9668c4aa7fc4d90775f0f2079ac3d02af5d9cda0;hpb=476b65903ad1082a1847eb2a8076ab1039358790;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 9668c4a..739ec28 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt
@@ -1,21 +1,26 @@
 package ru.deadsoftware.cavedroid.game.actions.useitem
 
-import ru.deadsoftware.cavedroid.game.GameItems
+import ru.deadsoftware.cavedroid.game.GameItemsHolder
 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,
+    private val gameItemsHolder: GameItemsHolder,
 ) : IUseItemAction {
 
     override fun perform(item: Item.Usable, x: Int, y: Int) {
-        gameWorld.placeToForeground(x, y, GameItems.getBlockId("water"))
-        mobsController.player.setCurrentInventorySlotItem(GameItems.getItemId("bucket_empty"))
+        gameWorld.placeToForeground(x, y, gameItemsHolder.getBlock("water"))
+        if (mobsController.player.gameMode != 1) {
+            mobsController.player.setCurrentInventorySlotItem(gameItemsHolder.getItem("bucket_empty"))
+        }
     }
 
     companion object {