EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-31 11:35:28 +02:00
Code Issues Projects Releases Wiki Activity

Repair no longer consumes items with item lore + Fixing logic errors in repair.

Browse Source
This commit is contained in:
nossr50
2019-04-16 11:17:56 -07:00
parent bbd43e156a
commit 30bc73be7d
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@@ -94,14 +94,34 @@ public class RepairManager extends SkillManager {
PlayerInventory inventory = player.getInventory();
Material repairMaterial = null;
boolean foundNonBasicMaterial = false;
//Find the first compatible repair material
for(Material repairMaterialCandidate : repairable.getRepairMaterials())
{
if(player.getInventory().contains(new ItemStack(repairMaterialCandidate)))
repairMaterial = repairMaterialCandidate;
for(ItemStack is : player.getInventory().getContents())
{
if(is.getType() == repairMaterialCandidate)
{
if(is.getItemMeta().getLore().isEmpty())
{
repairMaterial = repairMaterialCandidate;
break;
} else {
foundNonBasicMaterial = true;
}
}
}
}
/* Abort the repair if no compatible basic repairing item found */
if(repairMaterial == null && foundNonBasicMaterial == true)
{
player.sendMessage(LocaleLoader.getString("Repair.NoBasicRepairMatsFound"));
return;
}
//byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
ItemStack toRemove = new ItemStack(repairMaterial);