R3944Realms/LeashedPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024/11/02

Browse Source 
Fix some little bug
Add areaTalk Command
This commit is contained in:
叁玖领域 2024-11-02 23:25:06 +08:00
parent 867a79f96b
commit 93e5d73fa4
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -54,6 +54,7 @@ runs {
client { client {
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces. // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
} }
server { server {

2
src/main/java/com/r3944realms/leashedplayer/CommonEventHandler.java
View File

@ -50,7 +50,7 @@ public class CommonEventHandler {
} }
if (entity instanceof LivingEntity living) { if (entity instanceof LivingEntity living) {
MobEffectInstance effect = living.getEffect(ModEffectRegister.NO_LEASH_EFFECT); 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 (entity instanceof PlayerLeashable player) {
if (player.getLeashHolder() != null) { if (player.getLeashHolder() != null) {
if (player.getLeashHolder() instanceof LeashRopeArrow arrow) if (player.getLeashHolder() instanceof LeashRopeArrow arrow)

2
src/main/java/com/r3944realms/leashedplayer/content/entities/LeashRopeArrow.java
View File

@ -212,7 +212,7 @@ public class LeashRopeArrow extends AbstractArrow {
hitOnEntityHandler(entity); hitOnEntityHandler(entity);
if(this.getOwner() instanceof LivingEntity livingEntity ) { if(this.getOwner() instanceof LivingEntity livingEntity ) {
MobEffectInstance effect = livingEntity.getEffect(ModEffectRegister.NO_LEASH_EFFECT); MobEffectInstance effect = livingEntity.getEffect(ModEffectRegister.NO_LEASH_EFFECT);
if(effect != null && effect.getDuration() > 0) { if(effect != null && effect.getDuration() != 0) {
this.setOwner(null); this.setOwner(null);
} }
} }

2
src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinPlayer.java
View File

@ -204,7 +204,7 @@ public abstract class MixinPlayer extends LivingEntity implements PlayerLeashabl
float leashLengthSelf = iEntityExtension.getLeashLength(); float leashLengthSelf = iEntityExtension.getLeashLength();
leashLength = leashLengthSelf > LeashCommand.MIN_VALUE ? leashLengthSelf : LeashCommand.MIN_VALUE; leashLength = leashLengthSelf > LeashCommand.MIN_VALUE ? leashLengthSelf : LeashCommand.MIN_VALUE;
MobEffectInstance effect = this.getEffect(ModEffectRegister.NO_LEASH_EFFECT); 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) if (entity instanceof LeashRopeArrow arrow)
arrow.setOwner(null); arrow.setOwner(null);
this.dropLeash(true, !(entity instanceof LeashRopeArrow)); this.dropLeash(true, !(entity instanceof LeashRopeArrow));