Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 00:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from Yazawazi/main

Browse Source 
Fix weapon refine
This commit is contained in:
Melledy
2022-04-19 04:14:17 -07:00
committed by GitHub
parent aedfb59831 3da79a1dc1
commit 2572d55c00
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
View File

@@ -438,8 +438,14 @@ public class InventoryManager {
return;
}
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
return;
if (weapon.getItemData().getAwakenMaterial() == 0) {
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
return;
}
} else {
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemData().getAwakenMaterial() != feed.getItemId()) {
return;
}
}
if (weapon.getRefinement() >= 4 || weapon.getAffixes() == null || weapon.getAffixes().size() == 0) {