From 0af4113c38d446173f5e00ad197387b1ae4138c0 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Mon, 4 Oct 2021 10:49:37 +0100
Subject: [PATCH] Optimized conditions

---
 .../willfp/reforges/conditions/conditions/ConditionAboveY.kt  | 4 ++++
 .../willfp/reforges/conditions/conditions/ConditionBelowY.kt  | 4 ++++
 .../willfp/reforges/conditions/conditions/ConditionInBiome.kt | 4 ++++
 .../willfp/reforges/conditions/conditions/ConditionInWater.kt | 4 ++++
 .../willfp/reforges/conditions/conditions/ConditionInWorld.kt | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionAboveY.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionAboveY.kt
index d6666c2..93123c4 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionAboveY.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionAboveY.kt
@@ -16,6 +16,10 @@ class ConditionAboveY: Condition("above_y") {
     fun handle(event: PlayerMoveEvent) {
         val player = event.player
 
+        if (event.from.y == event.to.y) {
+            return
+        }
+
         ReforgeLookup.updateReforges(player)
     }
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionBelowY.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionBelowY.kt
index a0b6c1f..d6717cd 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionBelowY.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionBelowY.kt
@@ -16,6 +16,10 @@ class ConditionBelowY: Condition("below_y") {
     fun handle(event: PlayerMoveEvent) {
         val player = event.player
 
+        if (event.from.y == event.to.y) {
+            return
+        }
+
         ReforgeLookup.updateReforges(player)
     }
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInBiome.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInBiome.kt
index 8cf0c0b..c576f97 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInBiome.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInBiome.kt
@@ -16,6 +16,10 @@ class ConditionInBiome: Condition("in_biome") {
     fun handle(event: PlayerMoveEvent) {
         val player = event.player
 
+        if (event.from.world?.getBiome(event.from) == event.to.world?.getBiome(event.to)) {
+            return
+        }
+
         ReforgeLookup.updateReforges(player)
     }
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWater.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWater.kt
index 00fcfc9..6251ac8 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWater.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWater.kt
@@ -16,6 +16,10 @@ class ConditionInWater: Condition("in_water") {
     fun handle(event: PlayerMoveEvent) {
         val player = event.player
 
+        if (event.from.world?.getBlockAt(event.from)?.type == event.to.world?.getBlockAt(event.to)?.type) {
+            return
+        }
+
         ReforgeLookup.updateReforges(player)
     }
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWorld.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWorld.kt
index 0839380..d8e4875 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWorld.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/conditions/conditions/ConditionInWorld.kt
@@ -16,6 +16,10 @@ class ConditionInWorld: Condition("in_world") {
     fun handle(event: PlayerMoveEvent) {
         val player = event.player
 
+        if (event.from.world == event.to.world) {
+            return
+        }
+
         ReforgeLookup.updateReforges(player)
     }