Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-09-28 04:27:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made shieldBlockCounter injection optional

Browse Source 
Fixed https://github.com/ViaVersion/ViaFabricPlus/issues/306
This commit is contained in:
FlorianMichael 2023-12-06 22:29:51 +01:00
parent 2e42a4565e
commit a1024831dc
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
View File

@ -45,7 +45,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Optional; import java.util.Optional;
@SuppressWarnings("ConstantValue") @SuppressWarnings("ConstantValue")
@Mixin(LivingEntity.class) @Mixin(value = LivingEntity.class, priority = 999 /* Workaround for https://github.com/ViaVersion/ViaFabricPlus/issues/306 */)
public abstract class MixinLivingEntity extends Entity { public abstract class MixinLivingEntity extends Entity {
@Shadow @Shadow
@ -177,7 +177,7 @@ public abstract class MixinLivingEntity extends Entity {
return height; return height;
} }
@ModifyConstant(method = "isBlocking", constant = @Constant(intValue = 5)) @ModifyConstant(method = "isBlocking", constant = @Constant(intValue = 5), require = 0 /* Workaround for https://github.com/ViaVersion/ViaFabricPlus/issues/306 */)
public int shieldBlockCounter(int constant) { public int shieldBlockCounter(int constant) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_8)) { if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_8)) {
return 0; return 0;