From bc1e1d28b9c002e92720ccbd51c6e3b6638befee Mon Sep 17 00:00:00 2001
From: lisoveliy <lisoveliy@proton.me>
Date: Fri, 31 Jul 2026 04:05:41 +0300
Subject: [PATCH] fix, refactor: removed unneccesary logic of saving Angry
 state to persistent storage

---
 .gitignore                                          |  2 ++
 src/main/kotlin/su/lisdev/rpf/RPF.kt                |  2 +-
 .../su/lisdev/rpf/ZombifiedPiglinLootRestore.kt     | 13 +------------
 .../su/lisdev/rpf/ZombifiedPiglinSpearDisable.kt    |  4 +---
 src/main/resources/plugin.yml                       |  4 ++--
 5 files changed, 7 insertions(+), 18 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..795fb59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/artifacts/RPF_debug.xml
+target/*
\ No newline at end of file
diff --git a/src/main/kotlin/su/lisdev/rpf/RPF.kt b/src/main/kotlin/su/lisdev/rpf/RPF.kt
index c1efcd8..3b92682 100644
--- a/src/main/kotlin/su/lisdev/rpf/RPF.kt
+++ b/src/main/kotlin/su/lisdev/rpf/RPF.kt
@@ -8,7 +8,7 @@ class RPF : JavaPlugin(), Listener {
     override fun onEnable() {
         server.pluginManager.registerEvents(ZombifiedPiglinLootRestore(this, logger),
             this)
-        server.pluginManager.registerEvents(ZombifiedPiglinSpearDisable(this),
+        server.pluginManager.registerEvents(ZombifiedPiglinSpearDisable(),
             this)
         logger.info("${server.name} has been enabled!")
     }
diff --git a/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinLootRestore.kt b/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinLootRestore.kt
index f915da3..8610180 100644
--- a/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinLootRestore.kt
+++ b/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinLootRestore.kt
@@ -4,12 +4,10 @@ import org.bukkit.Material
 import org.bukkit.NamespacedKey
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.entity.PigZombie
-import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDeathEvent
-import org.bukkit.event.entity.EntityTargetLivingEntityEvent
 import org.bukkit.inventory.EntityEquipment
 import org.bukkit.inventory.EquipmentSlot
 import org.bukkit.inventory.ItemStack
@@ -33,8 +31,7 @@ class ZombifiedPiglinLootRestore(plugin: JavaPlugin, val logger: Logger) : Liste
         logger.info("Piglin vanilla anger: ${piglin.isAngry}, Piglin NBT data anger: " +
                     "${piglin.persistentDataContainer.has(aggroKey, PersistentDataType.BYTE)}")
 
-        if (!(piglin.isAngry || piglin.persistentDataContainer.has(aggroKey,
-                PersistentDataType.BYTE))) return
+        if (!piglin.isAngry) return
 
         val rng = ThreadLocalRandom.current()
 
@@ -70,14 +67,6 @@ class ZombifiedPiglinLootRestore(plugin: JavaPlugin, val logger: Logger) : Liste
         event.droppedExp = exp
     }
 
-    @EventHandler(ignoreCancelled = true)
-    fun onEntityTarget(event: EntityTargetLivingEntityEvent) {
-        val piglin = event.entity as? PigZombie ?: return
-        if (event.target !is Player) return
-        piglin.persistentDataContainer.set(aggroKey, PersistentDataType.BYTE,
-            1)
-    }
-
     private fun randomlyDamaged(item: ItemStack, rng: ThreadLocalRandom):
             ItemStack {
         val meta = item.itemMeta as? Damageable ?: return item
diff --git a/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinSpearDisable.kt b/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinSpearDisable.kt
index 67d101c..a56e72b 100644
--- a/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinSpearDisable.kt
+++ b/src/main/kotlin/su/lisdev/rpf/ZombifiedPiglinSpearDisable.kt
@@ -6,10 +6,8 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntitySpawnEvent
 import org.bukkit.inventory.ItemStack
-import org.bukkit.plugin.java.JavaPlugin
-import java.util.logging.Logger
 
-class ZombifiedPiglinSpearDisable(plugin: JavaPlugin)  : Listener {
+class ZombifiedPiglinSpearDisable() : Listener {
 
     @EventHandler
     private fun onEntitySpawn(event: EntitySpawnEvent){
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2f44b3a..43279be 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
-name: ReturnPiglinXP
+name: ReturnPiglinFarms
 description: $description
 version: '${version}'
 
@@ -7,4 +7,4 @@ api-version: '1.21'
 load: STARTUP
 
 authors: [ Lisoveliy ]
-website: https://git.lisdev.su
+website: https://git.lisdev.su/Lisoveliy/RPF