From 37fdb9fa901603daf13c2361f23170cd1262842c Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 11 Feb 2022 22:03:46 +0800 Subject: [PATCH] Update README --- .github/jetbrains.png | Bin 0 -> 8741 bytes README.md | 6 +++++- .../EntityMixin_ActivationRange.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .github/jetbrains.png diff --git a/.github/jetbrains.png b/.github/jetbrains.png new file mode 100644 index 0000000000000000000000000000000000000000..8d96653b580dabb4792cc38787cf7cfcfb7a02f4 GIT binary patch literal 8741 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 literal 0 HcmV?d00001 diff --git a/README.md b/README.md index 58240d3b..8d531af8 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A Bukkit server implementation utilizing Mixin. | :----: |:-------:| :---: | :---: | | 1.18.x | 39.0.59 | ACTIVE | [![1.18 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-18?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-18) | | 1.17.x | 37.1.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.17/1.0.2) | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) | -| 1.16.x | 36.2.19 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) | +| 1.16.x | 36.2.26 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) | | 1.15.x | 31.2.48 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19) | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) | | 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) | @@ -27,6 +27,8 @@ A Bukkit server implementation utilizing Mixin. ## Support +Read [FAQ](https://github.com/IzzelAliz/Arclight/wiki/FAQ) before reporting issue. + Discord server https://discord.gg/ZvTY5SC QQ Group chat 3556966 @@ -48,6 +50,8 @@ applications. YourKit is the creator of YourKit .NET Profiler, and YourKit YouMonitor. +[![](.github/jetbrains.png)](https://www.jetbrains.com/?from=Arclight) + [![](.github/nexusnode.gif)](https://nexusnode.com/minecraft.php) Get 10% off hosting server with promocode **ARCLIGHT** at [NEXUSNODE](https://nexusnode.com/minecraft.php) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java index 1da96c5e..562df32b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java @@ -3,6 +3,7 @@ package io.izzel.arclight.common.mixin.optimization.general.activationrange; import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.ArclightConstants; import io.izzel.arclight.common.bridge.optimization.EntityBridge_ActivationRange; +import io.izzel.arclight.common.mod.util.DistValidate; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; @@ -32,7 +33,7 @@ public abstract class EntityMixin_ActivationRange implements EntityBridge_Activa @Inject(method = "", at = @At("RETURN")) private void arclight$init(EntityType entityTypeIn, Level worldIn, CallbackInfo ci) { activationType = ActivationRange.initializeEntityActivationType((Entity) (Object) this); - if (worldIn != null) { + if (DistValidate.isValid(worldIn)) { this.defaultActivationState = ActivationRange.initializeEntityActivationState((Entity) (Object) this, ((WorldBridge) worldIn).bridge$spigotConfig()); } else { this.defaultActivationState = false;