#2 - added filter for armor item in hands

Astra-Interactive · Jul 28, 2023 · 318db2d · 318db2d
1 parent 6b765dc
commit 318db2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ makeevrserg.java.ktarget=17
 # Project
 makeevrserg.project.name=IaHook
 makeevrserg.project.group=ru.astrainteractive.iahook
-makeevrserg.project.version.string=0.0.8
+makeevrserg.project.version.string=0.0.9
 makeevrserg.project.description=ItemsAdder hook for EmpireSMP
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://empireprojekt.ru

diff --git a/plugin/src/main/kotlin/ru/astrainteractive/iahook/util/PassiveManaRestore.kt b/plugin/src/main/kotlin/ru/astrainteractive/iahook/util/PassiveManaRestore.kt
@@ -46,7 +46,12 @@ class PassiveManaRestore(
         val allContent = listOf(
             player.inventory.itemInMainHand,
             player.inventory.itemInOffHand
-        ) + player.inventory.armorContents.filterNotNull()
+        ).filter {
+            !it.type.name.endsWith("_HELMET", true)
+                    && !it.type.name.endsWith("_CHESTPLATE", true)
+                    && !it.type.name.endsWith("_LEGGINGS", true)
+                    && !it.type.name.endsWith("_BOOTS", true)
+        } + player.inventory.armorContents.filterNotNull()
 
         allContent.firstOrNull {
             val customItem = it.let(CustomStack::byItemStack)