Skip to content

Commit

Permalink
Merge branch 'develop' into feature/character-warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ScuffedNewt authored Sep 7, 2024
2 parents b1b8559 + 0cf25a9 commit cc5ef70
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions app/Services/CharacterManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -1934,7 +1934,6 @@ private function handleCharacterImage($data, $character, $isMyo = false) {
try {
if ($isMyo) {
$data['species_id'] = isset($data['species_id']) && $data['species_id'] ? $data['species_id'] : null;
$data['subtype_ids'] = isset($data['subtype_ids']) && $data['subtype_ids'] ? $data['subtype_ids'] : null;
$data['rarity_id'] = isset($data['rarity_id']) && $data['rarity_id'] ? $data['rarity_id'] : null;

// Use default images for MYO slots without an image provided
Expand All @@ -1948,7 +1947,7 @@ private function handleCharacterImage($data, $character, $isMyo = false) {
}
}
$imageData = Arr::only($data, [
'species_id', 'subtype_ids', 'rarity_id', 'use_cropper',
'species_id', 'rarity_id', 'use_cropper',
'x0', 'x1', 'y0', 'y1', 'content_warnings',
]);
$imageData['use_cropper'] = isset($data['use_cropper']);
Expand Down

0 comments on commit cc5ef70

Please sign in to comment.