diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src index 5d2b146b08..f72c4f0567 160000 --- a/dependencies/symbol-processor/src +++ b/dependencies/symbol-processor/src @@ -1 +1 @@ -Subproject commit 5d2b146b08f48bc0e185d224eb69cb718c62bf72 +Subproject commit f72c4f0567c62897d74c734819c11705df0bf4ee diff --git a/mods/include/mods/classic-ui/classic-ui.h b/mods/include/mods/classic-ui/classic-ui.h index 159c7b2fe6..b443981124 100644 --- a/mods/include/mods/classic-ui/classic-ui.h +++ b/mods/include/mods/classic-ui/classic-ui.h @@ -3,6 +3,6 @@ #include extern "C" { -GuiComponent_blit_t get_blit_with_classic_hud_offset(); +std::remove_reference_t get_blit_with_classic_hud_offset(); int get_classic_hud_y_offset(Minecraft *minecraft); } \ No newline at end of file diff --git a/mods/src/classic-ui/classic-ui.cpp b/mods/src/classic-ui/classic-ui.cpp index f384b6c712..15a58b8eef 100644 --- a/mods/src/classic-ui/classic-ui.cpp +++ b/mods/src/classic-ui/classic-ui.cpp @@ -26,7 +26,7 @@ static void Gui_renderHearts_GuiComponent_blit_hearts_injection(GuiComponent *co // Call Original Method component->blit(x_dest, y_dest, x_src, y_src, width_dest, height_dest, width_src, height_src); } -GuiComponent_blit_t get_blit_with_classic_hud_offset() { +std::remove_reference_t get_blit_with_classic_hud_offset() { return use_classic_hud ? Gui_renderHearts_GuiComponent_blit_hearts_injection : GuiComponent_blit->get(false); } static void Gui_renderHearts_GuiComponent_blit_armor_injection(Gui *component, int32_t x_dest, int32_t y_dest, int32_t x_src, int32_t y_src, int32_t width_dest, int32_t height_dest, int32_t width_src, int32_t height_src) { diff --git a/mods/src/death/death.cpp b/mods/src/death/death.cpp index c30e71fd71..2c80478369 100644 --- a/mods/src/death/death.cpp +++ b/mods/src/death/death.cpp @@ -120,7 +120,7 @@ static void ServerPlayer_actuallyHurt_injection(ServerPlayer *player, const int3 Player_actuallyHurt_injection(Mob_actuallyHurt->get(false), player, damage); } static void LocalPlayer_actuallyHurt_injection(LocalPlayer_actuallyHurt_t original, LocalPlayer *player, const int32_t damage) { - Player_actuallyHurt_injection(std::move(original), player, damage); + Player_actuallyHurt_injection(original, player, damage); } // Init