Switch carried knocked pose to ride

This commit is contained in:
2026-01-07 11:42:12 +01:00
parent 375bff6d18
commit dc98b2a567
@@ -1,6 +1,7 @@
package net.fretux.knockedback.effects; package net.fretux.knockedback.effects;
import net.fretux.knockedback.KnockedManager; import net.fretux.knockedback.KnockedManager;
import net.fretux.knockedback.CarryManager;
import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.Pose;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingEvent;
@@ -21,7 +22,11 @@ public class KnockedEffect {
player.hurtMarked = true; player.hurtMarked = true;
player.setNoGravity(false); player.setNoGravity(false);
player.setDeltaMovement(0, player.getDeltaMovement().y(), 0); player.setDeltaMovement(0, player.getDeltaMovement().y(), 0);
if (player.getForcedPose() != Pose.SWIMMING) { if (CarryManager.isBeingCarried(player.getUUID())) {
if (player.getForcedPose() == Pose.SWIMMING) {
player.setForcedPose(null);
}
} else if (player.getForcedPose() != Pose.SWIMMING) {
player.setForcedPose(Pose.SWIMMING); player.setForcedPose(Pose.SWIMMING);
} }
} else if (player.getForcedPose() == Pose.SWIMMING) { } else if (player.getForcedPose() == Pose.SWIMMING) {
@@ -59,4 +64,4 @@ public class KnockedEffect {
event.getEntity().setDeltaMovement(0, 0, 0); event.getEntity().setDeltaMovement(0, 0, 0);
} }
} }
} }