From 96a5889111d86e482e218f676e904d810b82b795 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 10 Mar 2022 03:38:08 +0800 Subject: [PATCH] Trial change to knockback in 1.8.8 --- .../nms/v1_8_R3/entity/EntityHumanNPC.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java index 948001e18..b4dacde2a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java @@ -118,18 +118,13 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean damageEntity(DamageSource damagesource, float f) { + boolean damaged = super.damageEntity(damagesource, f); + // knock back velocity is cancelled and sent to client for handling when // the entity is a player. there is no client so make this happen // manually. - boolean damaged = super.damageEntity(damagesource, f); if (damaged && velocityChanged) { velocityChanged = false; - Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() { - @Override - public void run() { - EntityHumanNPC.this.velocityChanged = true; - } - }); } return damaged; } @@ -287,6 +282,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable super.l(); return; } + super.K(); boolean navigating = npc.getNavigator().isNavigating(); if (!navigating && getBukkitEntity() != null