Skip to content

Commit 1ccf422

Browse files
committed
One more little refactor bug
1 parent 006ea0b commit 1ccf422

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

ui/avatar_selection.lua

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ end
165165
avatar_preview_card_click_override = function(self)
166166
if self.params.mpapi_avatar_preview then
167167
G.FUNCS.mpapi_open_avatar_selection()
168-
return
168+
return true
169169
end
170170
end
171171

172172
avatar_preview_card_hover_override = function(self)
173173
if self.params.mpapi_avatar_preview then
174174
self:juice_up(0.05, 0.03)
175-
return
175+
return true
176176
end
177177
end
178178

@@ -182,20 +182,20 @@ avatar_selectable_card_click_override = function(self)
182182
MPAPI._internal.set_preferred_joker(joker_key, function(err, data)
183183
if err then
184184
MPAPI.sendWarnMessage('Failed to set avatar: ' .. tostring(err))
185-
return
185+
return true
186186
end
187187
MPAPI.sendDebugMessage('Avatar set to: ' .. joker_key)
188188
end)
189189
G.FUNCS.mpapi_back_to_account_overlay()
190-
return
190+
return true
191191
end
192192
end
193193

194194
avatar_selectable_card_hover_override = function(self)
195195
if self.params.mpapi_avatar_selectable then
196196
self:juice_up(0.05, 0.03)
197197
play_sound('paper1', math.random() * 0.2 + 0.9, 0.35)
198-
return
198+
return true
199199
end
200200
end
201201

@@ -227,14 +227,22 @@ end
227227

228228
local _card_click_ref = Card.click
229229
function Card:click()
230-
avatar_preview_card_click_override(self)
231-
avatar_selectable_card_click_override(self)
230+
if avatar_preview_card_click_override(self) then
231+
return
232+
end
233+
if avatar_selectable_card_click_override(self) then
234+
return
235+
end
232236
_card_click_ref(self)
233237
end
234238

235239
local _card_hover_ref = Card.hover
236240
function Card:hover()
237-
avatar_preview_card_hover_override(self)
238-
avatar_selectable_card_hover_override(self)
241+
if avatar_preview_card_hover_override(self) then
242+
return
243+
end
244+
if avatar_selectable_card_hover_override(self) then
245+
return
246+
end
239247
_card_hover_ref(self)
240248
end

0 commit comments

Comments
 (0)