From 328396a6e7bc213bfa9f9dbd3da3cd2fa9a33ef1 Mon Sep 17 00:00:00 2001 From: Robbe Bryssinck Date: Sat, 9 Dec 2023 12:48:19 +0100 Subject: [PATCH 1/3] fix: invisible weapons and magic --- Code/client/Services/Generic/InventoryService.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Code/client/Services/Generic/InventoryService.cpp b/Code/client/Services/Generic/InventoryService.cpp index e74c8e7a7..a525e5415 100644 --- a/Code/client/Services/Generic/InventoryService.cpp +++ b/Code/client/Services/Generic/InventoryService.cpp @@ -179,8 +179,11 @@ void InventoryService::OnNotifyEquipmentChanges(const NotifyEquipmentChanges& ac // There's a bug where double equipping something magically unequips something secretly. // TODO: should this be done for armor as well? // Also, find out why the client is sending two equip messages in the first place. + // TODO: this fix makes it so that weapons and spells are sometimes invisible :/ + #if 0 if (!acMessage.Unequip && pActor->GetEquippedWeapon(slotId) == pItem) return; + #endif #endif auto* pEquipManager = EquipManager::Get(); From 002bf01d98cd898e6f686ce2522c10110e0d3aff Mon Sep 17 00:00:00 2001 From: Robbe Bryssinck Date: Sat, 9 Dec 2023 12:53:35 +0100 Subject: [PATCH 2/3] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c487162e1..c6d98031a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -40,7 +40,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: '2.7.6' + xmake-version: '2.8.5' # Update xmake repository (in order to have the file that will be cached) - name: Update xmake repository From 2fddd9bf66ed0fd3843f4799e447721367b7fef7 Mon Sep 17 00:00:00 2001 From: Robbe Bryssinck Date: Sat, 9 Dec 2023 12:53:48 +0100 Subject: [PATCH 3/3] Update windows.yml --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a72ebf90b..d5130eb1a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,7 +30,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: '2.7.6' + xmake-version: '2.8.5' # Install node #- name: Setup nodejs