diff --git a/CHANGELOG.md b/CHANGELOG.md index eb1dbc0afb..5a256a73c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -171,6 +171,7 @@ - Saccharine Leaves can now be bone mealed - Fixed equipping a stack of items instead of one item of a stack - Fixed TM stack consumption in TMM screen when player teaches a move to species +- Fixed every Miltank giving mushroom stew, not only mushroom variants ### Developer - Evolution requirements can now set `pokedexIcon` and `pokedexTooltip` directly in their JSON to control how they're shown on the Pokédex's evolution tree, for example: diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt index c6a55879fd..367f6fbe88 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt @@ -1192,7 +1192,7 @@ open class PokemonEntity( itemStack.hurtAndBreak(1, player, EquipmentSlot.MAINHAND) return InteractionResult.SUCCESS } else if (itemStack.`is`(Items.BOWL)) { - if (pokemon.aspects.any { it.contains("mooshtank") }) { + if (pokemon.aspects.any { it.contains("mooshtank") && !it.contains("mooshtank-false") }) { player.playSound(SoundEvents.MOOSHROOM_MILK, 1.0f, 1.0f) // if the Mooshtank ate a Flower beforehand if (pokemon.lastFlowerFed != ItemStack.EMPTY && pokemon.aspects.any { it.contains("mooshtank-brown") }) { @@ -1234,7 +1234,8 @@ open class PokemonEntity( ) { if (pokemon.aspects.any { it.contains("mooshtank-brown") }) { player.playSound(SoundEvents.MOOSHROOM_EAT, 1.0f, 1.0f) - pokemon.lastFlowerFed = itemStack + pokemon.lastFlowerFed = itemStack.copyWithCount(1) + if (!player.isCreative && !level().isClientSide) itemStack.shrink(1) return InteractionResult.sidedSuccess(level().isClientSide) } } else if (!player.isShiftKeyDown && StashHandler.interactMob(player, pokemon, itemStack)) { @@ -2741,4 +2742,4 @@ open class PokemonEntity( } fun hasRider() = this.passengers.any { it is LivingEntity } -} \ No newline at end of file +}