Fix entity despawn (#576 #579)

This commit is contained in:
IzzelAliz 2022-05-02 15:07:20 +08:00
parent 8a1ebb0817
commit 91af85d335
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338

View File

@ -34,6 +34,7 @@ import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@ -245,7 +246,7 @@ public abstract class MobMixin extends LivingEntityMixin implements MobEntityBri
@Redirect(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Mob;removeWhenFarAway(D)Z")) @Redirect(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Mob;removeWhenFarAway(D)Z"))
public boolean arclight$checkDespawn(Mob mobEntity, double distanceToClosestPlayer) { public boolean arclight$checkDespawn(Mob mobEntity, double distanceToClosestPlayer) {
return true; return this.overridePersistenceRequired || mobEntity.removeWhenFarAway(distanceToClosestPlayer);
} }
@Inject(method = "interact", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Mob;dropLeash(ZZ)V")) @Inject(method = "interact", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Mob;dropLeash(ZZ)V"))
@ -350,8 +351,11 @@ public abstract class MobMixin extends LivingEntityMixin implements MobEntityBri
return this.persistenceRequired; return this.persistenceRequired;
} }
@Unique private boolean overridePersistenceRequired;
public void setPersistenceRequired(boolean value) { public void setPersistenceRequired(boolean value) {
this.persistenceRequired = value; this.persistenceRequired = value;
this.overridePersistenceRequired = true;
} }
@Override @Override