Merge branch 'master' into 1.17

src/main/java/carpet/mixins/PlayerEntity_fakePlayersMixin.java

@@ -0,0 +1,28 @@
+package carpet.mixins;
+
+import carpet.patches.EntityPlayerMPFake;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(PlayerEntity.class)
+public abstract class PlayerEntity_fakePlayersMixin
+{
+    /**
+     * To make sure player attacks are able to knockback fake players
+     */
+    @Redirect(
+            method = "attack",
+            at = @At(
+                    value = "FIELD",
+                    target = "Lnet/minecraft/entity/Entity;velocityModified:Z",
+                    ordinal = 0
+            )
+    )
+    private boolean velocityModifiedAndNotCarpetFakePlayer(Entity target)
+    {
+        return target.velocityModified && !(target instanceof EntityPlayerMPFake);
+    }
+}