diff --git a/patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch index bb267d6d..2c4b0fcc 100644 --- a/patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch +++ b/patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Polpot: Make egg and snowball can knockback player Original project: https://github.com/PolpotMC/Polpot diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java -index 440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6..cb430ae1628cbf48a002991fd1c5674e4d3f63ac 100644 +index 440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6..3ae61e3c63bbd68af3123721b2535c6a43465276 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java @@ -3,6 +3,7 @@ package net.minecraft.world.entity.projectile; @@ -24,14 +24,14 @@ index 440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6..cb430ae1628cbf48a002991fd1c5674e + // Leaf - Polpot start - make snowball can knockback player + if (org.dreeam.leaf.LeafConfig.snowballCanKnockback && entity instanceof ServerPlayer) { + entity.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F); -+ ((ServerPlayer) entity).knockback(0.4000000059604645D, this.getX() - entity.getX(), this.getZ() - entity.getZ(), this); ++ ((ServerPlayer) entity).knockback(0.4000000059604645D, this.getX() - entity.getX(), this.getZ() - entity.getZ()); + } + // Leaf - Polpot end } // Purpur start - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java -index 785196e6f4677074890ca965e9add85ccfd0e6e3..c2d9b3110756fa35829f0c01c06331f95ca7998d 100644 +index 785196e6f4677074890ca965e9add85ccfd0e6e3..205f3ec52dd2dc94cb1cf3a051f48a9b2c06e555 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java @@ -45,7 +45,14 @@ public class ThrownEgg extends ThrowableItemProjectile { @@ -43,7 +43,7 @@ index 785196e6f4677074890ca965e9add85ccfd0e6e3..c2d9b3110756fa35829f0c01c06331f9 + // Leaf - Polpot start - make egg can knockback player + if (org.dreeam.leaf.LeafConfig.eggCanKnockback && entity instanceof ServerPlayer) { + entity.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F); -+ ((ServerPlayer) entity).knockback(0.4000000059604645D, this.getX() - entity.getX(), this.getZ() - entity.getZ(), this); ++ ((ServerPlayer) entity).knockback(0.4000000059604645D, this.getX() - entity.getX(), this.getZ() - entity.getZ()); + } + // Leaf - Polpot end - make egg can knockback player }