Implement cancellable variant

CitizensDev · Nov 14, 2022 · d9c55b9 · d9c55b9
1 parent 868c7a4
commit d9c55b9
Show file tree

Hide file tree

Showing 651 changed files with 1,941 additions and 653 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java
@@ -286,7 +286,7 @@ public TraitFactory getTraitFactory() {
     }
 
     private void loadMavenLibraries() {
-        getLogger().info("Loading external libraries...");
+        getLogger().info("Loading external libraries");
 
         LibraryManager lib = new BukkitLibraryManager(this);
         lib.addMavenCentral();
@@ -324,8 +324,6 @@ private void loadMavenLibraries() {
                 .relocate("net{}kyori", "clib{}net{}kyori").build());
         lib.loadLibrary(Library.builder().groupId("net{}kyori").artifactId("examination-string").version("1.3.0")
                 .relocate("net{}kyori", "clib{}net{}kyori").build());
-
-        getLogger().info("Loaded.");
     }
 
     @Override

diff --git a/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java b/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java
@@ -33,6 +33,8 @@ public void run() {
         if (sleeping) {
             if (at == null) {
                 wakeup();
+            } else {
+                npc.teleport(at, TeleportCause.PLUGIN);
             }
             return;
         }
@@ -48,7 +50,6 @@ public void run() {
                 SUPPORT_BLOCKDATA = false;
             }
         }
-        npc.teleport(at, TeleportCause.PLUGIN);
         if (npc.getEntity() instanceof Player) {
             Player player = (Player) npc.getEntity();
             if ((SUPPORT_BLOCKDATA && at.getBlock().getBlockData() instanceof Bed)

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
@@ -64,7 +64,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
@@ -61,7 +61,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
@@ -70,7 +70,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
@@ -81,7 +81,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
@@ -85,7 +85,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
@@ -76,7 +76,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
@@ -61,7 +61,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
@@ -70,7 +70,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
@@ -70,7 +70,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
@@ -47,7 +47,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
@@ -79,7 +79,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
@@ -62,7 +62,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java
@@ -71,7 +71,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
@@ -67,7 +67,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java
@@ -68,7 +68,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java
@@ -57,7 +57,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java
@@ -58,7 +58,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java
@@ -68,7 +68,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java
@@ -67,7 +67,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
@@ -57,7 +57,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java
@@ -62,7 +62,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
@@ -73,7 +73,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java
@@ -56,7 +56,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
@@ -47,7 +47,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java
@@ -69,7 +69,9 @@ public void a(Entity entity, float strength, double dx, double dz) {
             NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
             Bukkit.getPluginManager().callEvent(event);
             Vector kb = event.getKnockbackVector();
-            super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            if (!event.isCancelled()) {
+                super.a(entity, (float) event.getStrength(), kb.getX(), kb.getZ());
+            }
         }
 
         @Override