ref: better horse control

Author: emyfops

common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt

@@ -6,30 +6,26 @@ import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.world.entitySearch
+import com.lambda.util.world.fastEntitySearch
 import net.minecraft.entity.passive.AbstractHorseEntity
+import net.minecraft.entity.passive.PigEntity
 import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket
 
-// ToDo: Rework this module. All mountables should work, solution should be more elegant.
 object EntityControl : Module(
     name = "EntityControl",
     description = "Control mountable entities",
     defaultTags = setOf(ModuleTag.MOVEMENT)
 ) {
-    private val forceMount by setting("Force Mount", true, description = "Attempts to force mount chested entities.").apply {
-        onValueChange { _, _ ->
-            resetMounts()
-        }
-    }
-    private val modified = mutableSetOf<AbstractHorseEntity>()
+    private val forceMount by setting("Force Mount", true, description = "Attempts to force mount chested entities.")
+
+    private val saddledHorses = mutableSetOf<AbstractHorseEntity>()
 
     init {
         listener<TickEvent.Pre> {
-            if (!forceMount) return@listener
-
-            entitySearch<AbstractHorseEntity>(8.0)
+            fastEntitySearch<AbstractHorseEntity>(8.0)
                 .forEach {
+                    if (!it.isSaddled) saddledHorses.add(it)
                     it.setHorseFlag(4, true)
-                    modified.add(it)
                 }
         }
 
@@ -45,11 +41,8 @@ object EntityControl : Module(
         }
 
         onDisable {
-            resetMounts()
+            saddledHorses.forEach { it.setHorseFlag(4, false) }
+            saddledHorses.clear()
         }
     }
-
-    private fun resetMounts() {
-        modified.forEach { it.updateSaddle() }
-    }
 }