mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-19 17:02:13 +02:00
Code

Replace Redirect for VelocityFromFluidEvent with WrapWithCondition

Browse Source 
Fixes #924
This commit is contained in:
Alexander01998 2024-05-09 21:04:42 +02:00
parent adf0058b63
commit a6ee72159e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/wurstclient/mixin/EntityMixin.java
View File

@ -11,10 +11,11 @@ import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.command.CommandOutput;
@ -29,19 +30,16 @@ import net.wurstclient.events.VelocityFromFluidListener.VelocityFromFluidEvent;
@Mixin(Entity.class)
public abstract class EntityMixin implements Nameable, EntityLike, CommandOutput
{
@Redirect(at = @At(value = "INVOKE",
@WrapWithCondition(at = @At(value = "INVOKE",
target = "Lnet/minecraft/entity/Entity;setVelocity(Lnet/minecraft/util/math/Vec3d;)V",
opcode = Opcodes.INVOKEVIRTUAL,
ordinal = 0),
method = "updateMovementInFluid(Lnet/minecraft/registry/tag/TagKey;D)Z")
private void setVelocityFromFluid(Entity entity, Vec3d velocity)
private boolean shouldSetVelocity(Entity instance, Vec3d velocity)
{
VelocityFromFluidEvent event =
new VelocityFromFluidEvent((Entity)(Object)this);
VelocityFromFluidEvent event = new VelocityFromFluidEvent(instance);
EventManager.fire(event);
if(!event.isCancelled())
entity.setVelocity(velocity);
return !event.isCancelled();
}
@Inject(at = @At("HEAD"),