From 93e5d73fa4e7d15ae596170400847dd5e25e1b10 Mon Sep 17 00:00:00 2001
From: 3944Realms <f256198830@hotmail.com>
Date: Sat, 2 Nov 2024 23:25:06 +0800
Subject: [PATCH] 2024/11/02 Fix some little bug Add areaTalk Command

---
 build.gradle                                                    | 1 +
 .../java/com/r3944realms/leashedplayer/CommonEventHandler.java  | 2 +-
 .../leashedplayer/content/entities/LeashRopeArrow.java          | 2 +-
 .../com/r3944realms/leashedplayer/mixin/both/MixinPlayer.java   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 943e2c2..c82e379 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,6 +54,7 @@ runs {
     client {
         // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
         systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+
     }
 
     server {
diff --git a/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java b/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java
index 6d3b436..c4a6283 100644
--- a/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java
+++ b/src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java
@@ -50,7 +50,7 @@ public class CommonEventHandler {
             }
             if (entity instanceof LivingEntity living) {
                 MobEffectInstance effect = living.getEffect(ModEffectRegister.NO_LEASH_EFFECT);
-                if(effect != null && effect.getDuration() > 0){
+                if(effect != null && effect.getDuration() != 0){
                     if (entity instanceof PlayerLeashable player) {
                         if (player.getLeashHolder() != null) {
                             if (player.getLeashHolder() instanceof LeashRopeArrow arrow)
diff --git a/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java b/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java
index d613cea..31ac64f 100644
--- a/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java
+++ b/src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java
@@ -212,7 +212,7 @@ public class LeashRopeArrow extends AbstractArrow  {
             hitOnEntityHandler(entity);
             if(this.getOwner() instanceof LivingEntity livingEntity ) {
                 MobEffectInstance effect = livingEntity.getEffect(ModEffectRegister.NO_LEASH_EFFECT);
-                if(effect != null && effect.getDuration() > 0) {
+                if(effect != null && effect.getDuration() != 0) {
                     this.setOwner(null);
                 }
             }
diff --git a/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinPlayer.java b/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinPlayer.java
index cdf89ef..c04239c 100644
--- a/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinPlayer.java
+++ b/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinPlayer.java
@@ -204,7 +204,7 @@ public abstract class MixinPlayer extends LivingEntity implements PlayerLeashabl
         float leashLengthSelf = iEntityExtension.getLeashLength();
         leashLength = leashLengthSelf > LeashCommand.MIN_VALUE ? leashLengthSelf : LeashCommand.MIN_VALUE;
         MobEffectInstance effect = this.getEffect(ModEffectRegister.NO_LEASH_EFFECT);
-        if(effect != null && effect.getDuration() > 0) {
+        if(effect != null && effect.getDuration() != 0) {
             if (entity instanceof LeashRopeArrow arrow)
                 arrow.setOwner(null);
             this.dropLeash(true, !(entity instanceof LeashRopeArrow));