From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:34:29 +0800 Subject: [PATCH] Configurable player knockback zombie diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index d44e48719fcf51f6d425b9c18835ad44339177df..d99a80657db3a24f79f094d7dbf81faab506937c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2041,6 +2041,8 @@ public abstract class LivingEntity extends Entity implements Attackable { } public void knockback(double d0, double d1, double d2, @Nullable Entity attacker, io.papermc.paper.event.entity.EntityKnockbackEvent.Cause cause) { // Paper - knockback events + if (!canKnockback(attacker, this)) return; // Leaf - Configurable player knockback zombie + d0 *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE); if (true || d0 > 0.0D) { // CraftBukkit - Call event even when force is 0 //this.hasImpulse = true; // CraftBukkit - Move down @@ -2068,6 +2070,20 @@ public abstract class LivingEntity extends Entity implements Attackable { } } + // Leaf start - Configurable player knockback zombie + private boolean canKnockback(@Nullable Entity attacker, LivingEntity target) { + if (!org.dreeam.leaf.config.modules.gameplay.Knockback.canPlayerKnockbackZombie) { + if (attacker instanceof ServerPlayer && target.getType() == EntityType.ZOMBIE) { // Player -> Zombie + return false; + } else if (attacker instanceof Projectile projectile && projectile.getOwner() instanceof ServerPlayer && target.getType() == EntityType.ZOMBIE) { // Player -> projectile -> Zombie + return false; + } + } + + return true; + } + // Leaf end - Configurable player knockback zombie + public void indicateDamage(double deltaX, double deltaZ) {} @Nullable diff --git a/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java b/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java index 35e8a9568cd37f4ed75d10a38beea996c8729388..df26a6e47fba5781000bafbda735629f9057971f 100644 --- a/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java +++ b/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java @@ -11,6 +11,7 @@ public class Knockback extends ConfigModules { public static boolean snowballCanKnockback = false; public static boolean eggCanKnockback = false; + public static boolean canPlayerKnockbackZombie = true; @Override public void onLoaded() { @@ -18,5 +19,7 @@ public class Knockback extends ConfigModules { "Make snowball can knockback players"); eggCanKnockback = config.getBoolean(getBasePath() + ".egg-knockback-players", eggCanKnockback, "Make egg can knockback players"); + canPlayerKnockbackZombie = config.getBoolean(getBasePath() + ".can-player-knockback-zombie", canPlayerKnockbackZombie, + "Make players can knockback zombie"); } }