Skip to content

Commit 1f15540

Browse files
authored
Merge pull request #7 from cerus/feat/player-ramming
Make players affected as well
2 parents 6f87b35 + b2ea4c9 commit 1f15540

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/main/java/io/ix0rai/ramel/mixin/CamelEntityMixin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package io.ix0rai.ramel.mixin;
22

33
import io.ix0rai.ramel.Config;
4+
import java.util.Objects;
45
import net.minecraft.entity.Entity;
56
import net.minecraft.entity.EntityType;
67
import net.minecraft.entity.LivingEntity;
78
import net.minecraft.entity.damage.DamageSource;
89
import net.minecraft.entity.effect.StatusEffects;
910
import net.minecraft.entity.passive.CamelEntity;
11+
import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
12+
import net.minecraft.server.network.ServerPlayerEntity;
1013
import net.minecraft.sound.SoundEvents;
1114
import net.minecraft.util.math.MathHelper;
1215
import net.minecraft.world.World;
@@ -16,8 +19,6 @@
1619
import org.spongepowered.asm.mixin.injection.Inject;
1720
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1821

19-
import java.util.Objects;
20-
2122
@Mixin(CamelEntity.class)
2223
public abstract class CamelEntityMixin extends LivingEntity {
2324
@Shadow public abstract boolean isDashing();
@@ -53,6 +54,10 @@ protected CamelEntityMixin(EntityType<? extends CamelEntity> entityType, World w
5354

5455
entity.takeKnockback(blockedImpact * speedAdjustedImpact * knockBackMultiplier,
5556
MathHelper.sin(this.getPitch() * ((float) Math.PI / 180)), -MathHelper.cos(this.getPitch() * ((float) Math.PI / 180)));
57+
if (entity instanceof ServerPlayerEntity player) {
58+
// The player won't feel any effects if we don't update the velocity
59+
player.networkHandler.send(new EntityVelocityUpdateS2CPacket(player));
60+
}
5661
});
5762
}
5863
}

0 commit comments

Comments
 (0)