diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java index aecdac0c9..5760bd85e 100644 --- a/main/src/main/java/net/citizensnpcs/Citizens.java +++ b/main/src/main/java/net/citizensnpcs/Citizens.java @@ -286,7 +286,7 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { } private void loadMavenLibraries() { - getLogger().info("Loading external libraries..."); + getLogger().info("Loading external libraries"); LibraryManager lib = new BukkitLibraryManager(this); lib.addMavenCentral(); @@ -324,8 +324,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { .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 index 532f3b5df..7fb1a4764 100644 --- 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 class SleepTrait extends Trait { if (sleeping) { if (at == null) { wakeup(); + } else { + npc.teleport(at, TeleportCause.PLUGIN); } return; } @@ -48,7 +50,6 @@ public class SleepTrait extends Trait { 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 index 8d2a6f5c4..44e4c3f20 100644 --- 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 class BatController extends MobEntityController { 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 index 074335131..42d296ebb 100644 --- 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 class BlazeController extends MobEntityController { 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 index 8c29c16cf..0706ebc52 100644 --- 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 class CaveSpiderController extends MobEntityController { 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 index d53a87f89..e05686d06 100644 --- 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 class ChickenController extends MobEntityController { 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 index 67ef9bf39..a5ab8a489 100644 --- 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 class CowController extends MobEntityController { 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 index f4a2a3b1f..450b7a2a9 100644 --- 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 class CreeperController extends MobEntityController { 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 index 6f367259a..0dcd197b4 100644 --- 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 class EnderDragonController extends MobEntityController { 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 index 440193de0..fdd35854a 100644 --- 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 class EndermanController extends MobEntityController { 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 index 39588fa93..35a9e88d2 100644 --- 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 class EndermiteController extends MobEntityController { 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 index dece537f7..fb245625e 100644 --- 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 class GhastController extends MobEntityController { 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 index 8df579d42..f6bc2d4b5 100644 --- 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 class GiantController extends MobEntityController { 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 index a46ebeafd..82b769e49 100644 --- 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 class GuardianController extends MobEntityController { 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 index 1374f551f..6e3732a62 100644 --- 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 class HorseController extends MobEntityController { 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 index 61faff1fc..4676e75c0 100644 --- 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 class IronGolemController extends MobEntityController { 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 index df8f5c889..e45876353 100644 --- 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 class MagmaCubeController extends MobEntityController { 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 index ec1e19d6b..ffc125cb4 100644 --- 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 class MushroomCowController extends MobEntityController { 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 index 6fcabbbcd..c8b5c64eb 100644 --- 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 class OcelotController extends MobEntityController { 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 index 6f94c6bf2..e8fb5e4a6 100644 --- 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 class PigController extends MobEntityController { 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 index fb20f7383..4f72458f0 100644 --- 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 class PigZombieController extends MobEntityController { 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 index 1b28c153e..974731ca5 100644 --- 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 class PolarBearController extends MobEntityController { 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 index 995382e24..7dcc34b24 100644 --- 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 class RabbitController extends MobEntityController { 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 index 5bdd2950e..c1f54e639 100644 --- 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 class SheepController extends MobEntityController { 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 index a4dd43dd4..e27c91848 100644 --- 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 class ShulkerController extends MobEntityController { 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 index 7a365845d..4e4af7d91 100644 --- 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 class SilverfishController extends MobEntityController { 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 index cbabe7ba0..b0dcd020b 100644 --- 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 class SkeletonController extends MobEntityController { 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 index dedec890e..14a593413 100644 --- 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 class SlimeController extends MobEntityController { 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 index e9fabe632..ec651e392 100644 --- 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 class SnowmanController extends MobEntityController { 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 index 8974958df..eeba6f746 100644 --- 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 class SpiderController extends MobEntityController { 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 index f04110096..189de00d2 100644 --- 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 class SquidController extends MobEntityController { 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 index 752911280..f7e3632e4 100644 --- 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 class VillagerController extends MobEntityController { 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 index 3c8c3a576..db45c3045 100644 --- 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 class WitchController extends MobEntityController { 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 index 4c8bca4c2..90f1929e3 100644 --- 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 class WitherController extends MobEntityController { 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 index 0e1390337..544893071 100644 --- 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 class WolfController extends MobEntityController { 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/ZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java index 3ce4710d3..439f4a20b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java @@ -56,7 +56,9 @@ public class ZombieController extends MobEntityController { 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/util/PlayerNavigation.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java index 6d7dd9b53..3291cc524 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java @@ -130,7 +130,8 @@ public class PlayerNavigation extends NavigationAbstract { if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { PathType localPathType = this.e.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5, paramInt6, true, true); - if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) || (localPathType == PathType.OPEN)) { + if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) + || (localPathType == PathType.OPEN)) { return false; } localPathType = this.e.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true, diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java index a11b19db2..be30dcefe 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java @@ -64,7 +64,9 @@ public class BatController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java index 7e468b60f..43ecb176e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java @@ -61,7 +61,9 @@ public class BlazeController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java index ffa76cea7..25a597ce0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java @@ -70,7 +70,9 @@ public class CaveSpiderController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java index 40f2e021f..360c26bed 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java @@ -81,7 +81,9 @@ public class ChickenController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java index dc79579fc..90756acc7 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java @@ -85,7 +85,9 @@ public class CowController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java index b01b7f790..d357d17a4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java @@ -73,7 +73,9 @@ public class CreeperController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java index 7ff6f4dc5..9d70af96f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java @@ -61,7 +61,9 @@ public class EnderDragonController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java index 378421862..225d948b2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java @@ -70,7 +70,9 @@ public class EndermanController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java index e9edfab91..f2174e1c1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java @@ -70,7 +70,9 @@ public class EndermiteController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java index f0de26ec4..6b807660e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java @@ -56,7 +56,9 @@ public class EvokerController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java index 3c0fbc74d..999f5bd85 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java @@ -47,7 +47,9 @@ public class GhastController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java index 795afe21c..0c1d6b329 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java @@ -56,7 +56,9 @@ public class GiantController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java index 372e1a57d..49a9551ae 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java @@ -56,7 +56,9 @@ public class GuardianController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java index 7a2b51a12..364425660 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java @@ -56,7 +56,9 @@ public class GuardianElderController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java index d198b8fa0..54a43f41d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java @@ -79,7 +79,9 @@ public class HorseController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java index 9b9f9e609..a9562871d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java @@ -79,7 +79,9 @@ public class HorseDonkeyController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java index 4a692029f..47e9a6b4e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java @@ -79,7 +79,9 @@ public class HorseMuleController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java index c04d4b901..a2dd342da 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java @@ -80,7 +80,9 @@ public class HorseSkeletonController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java index 7bd657bde..04cdfd0cd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java @@ -80,7 +80,9 @@ public class HorseZombieController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java index a875c5546..eb127a059 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java @@ -56,7 +56,9 @@ public class IronGolemController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java index 2848f9561..524ce5937 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java @@ -79,7 +79,9 @@ public class LlamaController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java index 8d645afc3..e8449b890 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java @@ -62,7 +62,9 @@ public class MagmaCubeController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java index 93d443bd7..96daa06e7 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java @@ -70,7 +70,9 @@ public class MushroomCowController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java index aa705e7fc..e39225be9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java @@ -67,7 +67,9 @@ public class OcelotController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java index 3fbdd902d..afb7f05bf 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java @@ -68,7 +68,9 @@ public class PigController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java index 220cdde96..9a0251c51 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java @@ -57,7 +57,9 @@ public class PigZombieController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java index d1c2834b5..3beba125a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java @@ -58,7 +58,9 @@ public class PolarBearController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java index 4bfdc7923..2aa499e14 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java @@ -68,7 +68,9 @@ public class RabbitController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java index 0fa765e20..7b0d18357 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java @@ -67,7 +67,9 @@ public class SheepController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java index 5b3d0a14f..0e2406ef1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java @@ -58,7 +58,9 @@ public class ShulkerController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java index df456787f..34bfba595 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java @@ -56,7 +56,9 @@ public class SilverfishController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java index bdf464b89..5d317d5df 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java @@ -56,7 +56,9 @@ public class SkeletonController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java index bafa4c3bf..1e4bb1330 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java @@ -56,7 +56,9 @@ public class SkeletonStrayController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java index 7ee8df998..05afc5b4f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java @@ -56,7 +56,9 @@ public class SkeletonWitherController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java index 7de8af01e..c8c1a88e7 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java @@ -62,7 +62,9 @@ public class SlimeController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java index 93adc30cf..ea7e67abe 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java @@ -56,7 +56,9 @@ public class SnowmanController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java index 0695a4840..96cfc7d46 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java @@ -56,7 +56,9 @@ public class SpiderController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java index cc931bec2..bde35f120 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java @@ -56,7 +56,9 @@ public class SquidController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java index d5c9a33fd..7e3b7704a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java @@ -50,7 +50,9 @@ public class VexController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java index 5bce47961..c156ed457 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java @@ -75,7 +75,9 @@ public class VillagerController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java index 9d89830e9..77b96f272 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java @@ -67,7 +67,9 @@ public class VindicatorController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java index c08f19d94..7679b75df 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java @@ -56,7 +56,9 @@ public class WitchController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java index a09264174..508079353 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java @@ -47,7 +47,9 @@ public class WitherController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java index 6ef778377..6ffdb59ab 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java @@ -69,7 +69,9 @@ public class WolfController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java index 7201e68b9..70ea9aa2b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java @@ -56,7 +56,9 @@ public class ZombieController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java index 3f367b335..a6d9ef7bd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java @@ -56,7 +56,9 @@ public class ZombieHuskController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java index 343c00150..44486b285 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java @@ -56,7 +56,9 @@ public class ZombieVillagerController extends MobEntityController { 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_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java index 3e86bbf8e..50c20cc51 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java @@ -128,7 +128,8 @@ public class PlayerNavigation extends NavigationAbstract { if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { PathType localPathType = this.e.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5, paramInt6, true, true); - if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) || (localPathType == PathType.OPEN)) { + if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) + || (localPathType == PathType.OPEN)) { return false; } localPathType = this.e.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true, diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java index fc941f44d..623c8cb96 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java @@ -65,7 +65,9 @@ public class BatController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java index ef03b2e2c..6734b4503 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java @@ -62,7 +62,9 @@ public class BlazeController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java index 758799912..3bc14821e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java @@ -71,7 +71,9 @@ public class CaveSpiderController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java index f3fb7cb3a..e8d24ca01 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java @@ -82,7 +82,9 @@ public class ChickenController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java index 4876378ef..e120701b1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java @@ -86,7 +86,9 @@ public class CowController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java index ecab5fee2..ff0b0f0da 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java @@ -74,7 +74,9 @@ public class CreeperController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java index e90b11bde..96f316519 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java @@ -62,7 +62,9 @@ public class EnderDragonController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java index 1561e8926..582a11c33 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java @@ -71,7 +71,9 @@ public class EndermanController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java index 2cae721de..ac97b5c27 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java @@ -71,7 +71,9 @@ public class EndermiteController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java index 112076a7a..799c4c3ff 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java @@ -57,7 +57,9 @@ public class EvokerController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java index 7aa281670..1c749449c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java @@ -48,7 +48,9 @@ public class GhastController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java index 4d3ed4b02..fb447fdbd 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java @@ -57,7 +57,9 @@ public class GiantController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java index 205ebc647..071dfd7b5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java @@ -57,7 +57,9 @@ public class GuardianController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java index 43ee84cfa..87c09d98d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java @@ -57,7 +57,9 @@ public class GuardianElderController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java index 35d8404a9..19aec65ea 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java @@ -86,7 +86,9 @@ public class HorseController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java index dc6d96894..a74af9150 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java @@ -86,7 +86,9 @@ public class HorseDonkeyController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java index 9f7f20108..b5a458f5a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java @@ -86,7 +86,9 @@ public class HorseMuleController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java index 2ecedf1f8..f9b06aee3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java @@ -88,7 +88,9 @@ public class HorseSkeletonController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java index 8a53cd56e..18c1835b8 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java @@ -88,7 +88,9 @@ public class HorseZombieController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java index 36003ed7f..5fda3596e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java @@ -57,7 +57,9 @@ public class IllusionerController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java index 110b34d10..253e55b62 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java @@ -57,7 +57,9 @@ public class IronGolemController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java index 5bb3e8dfc..087176f07 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java @@ -80,7 +80,9 @@ public class LlamaController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java index 202cbf163..c38126048 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java @@ -63,7 +63,9 @@ public class MagmaCubeController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java index 615642b48..c49ff73e1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java @@ -71,7 +71,9 @@ public class MushroomCowController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java index 6249ca6cb..34ef05aa1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java @@ -68,7 +68,9 @@ public class OcelotController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java index 898465f8e..97beb4e9d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java @@ -50,7 +50,9 @@ public class ParrotController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java index 60a71c532..eee1c64e0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java @@ -69,7 +69,9 @@ public class PigController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java index 55447eeef..292c58b95 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java @@ -58,7 +58,9 @@ public class PigZombieController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java index cdef616fb..117bfe6b3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java @@ -59,7 +59,9 @@ public class PolarBearController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java index ab85d7629..4697ca31c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java @@ -69,7 +69,9 @@ public class RabbitController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java index 4a289be42..ab9451e55 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java @@ -68,7 +68,9 @@ public class SheepController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java index 1901887d6..a78554954 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java @@ -58,7 +58,9 @@ public class ShulkerController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java index cd1703436..f4e6d6d8b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java @@ -57,7 +57,9 @@ public class SilverfishController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java index e08713682..d9c737214 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java @@ -57,7 +57,9 @@ public class SkeletonController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java index 6cc752366..8eca635d0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java @@ -57,7 +57,9 @@ public class SkeletonStrayController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java index fa1b2cb3d..179e40920 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java @@ -57,7 +57,9 @@ public class SkeletonWitherController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java index 0702eef29..4acf20732 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java @@ -63,7 +63,9 @@ public class SlimeController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java index 99e1a237a..d9e3b4442 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java @@ -57,7 +57,9 @@ public class SnowmanController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java index df9c3692d..2dd4ec2d6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java @@ -57,7 +57,9 @@ public class SpiderController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java index 9cadab5f8..f30124b77 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java @@ -57,7 +57,9 @@ public class SquidController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java index a2884b021..320f2f1e1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java @@ -51,7 +51,9 @@ public class VexController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java index 885dd7e0e..fbe7b338f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java @@ -76,7 +76,9 @@ public class VillagerController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java index 49c247b6a..aed8949f2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java @@ -68,7 +68,9 @@ public class VindicatorController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java index 6b1aab3e5..0ebf22a4b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java @@ -57,7 +57,9 @@ public class WitchController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java index 25ebdbd1d..9e8630e0a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java @@ -48,7 +48,9 @@ public class WitherController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java index b65847283..c7c4df78d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java @@ -70,7 +70,9 @@ public class WolfController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java index 251dc3f3c..bec74125a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java @@ -57,7 +57,9 @@ public class ZombieController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java index 87627ce19..857bf24ff 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java @@ -57,7 +57,9 @@ public class ZombieHuskController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java index 6cf4e1fd5..50476bb44 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java @@ -57,7 +57,9 @@ public class ZombieVillagerController extends MobEntityController { 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_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java index 50e7114fd..09b0f4c72 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java @@ -103,7 +103,8 @@ public class PlayerNavigation extends NavigationAbstract { if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { PathType localPathType = this.h.a(this.b, m, paramInt2 - 1, n, this.a, paramInt4, paramInt5, paramInt6, true, true); - if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) || (localPathType == PathType.OPEN)) { + if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) + || (localPathType == PathType.OPEN)) { return false; } localPathType = this.h.a(this.b, m, paramInt2, n, this.a, paramInt4, paramInt5, paramInt6, true, diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java index b6c14630b..32eb9bbfe 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java @@ -69,7 +69,9 @@ public class BatController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java index aefed9775..bb5e903d4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java @@ -66,7 +66,9 @@ public class BlazeController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java index 1d0f59833..a94557863 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java @@ -75,7 +75,9 @@ public class CaveSpiderController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java index 94d8fddfc..37e4b6515 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java @@ -89,7 +89,9 @@ public class ChickenController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java index d99083f72..13024752e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java @@ -83,7 +83,9 @@ public class CodController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java index 2c14c4590..c9293edad 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java @@ -90,7 +90,9 @@ public class CowController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java index 22fdca8ab..2d040a919 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java @@ -78,7 +78,9 @@ public class CreeperController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java index ffa23a51d..8a2456621 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java @@ -81,7 +81,9 @@ public class DolphinController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java index 908e84985..4964cfe30 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java @@ -75,7 +75,9 @@ public class DrownedController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java index 2c3df6998..2aa1431fa 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java @@ -69,7 +69,9 @@ public class EnderDragonController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java index 237623bef..dddd7caef 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java @@ -75,7 +75,9 @@ public class EndermanController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java index c58a99f64..b70bf41e6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java @@ -75,7 +75,9 @@ public class EndermiteController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java index 7a2597491..7eedce9b0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java @@ -61,7 +61,9 @@ public class EvokerController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java index be52252e9..91ab03cb0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java @@ -52,7 +52,9 @@ public class GhastController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java index 5fd045899..88f8f4e99 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java @@ -61,7 +61,9 @@ public class GiantController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java index 10b74540c..095c61244 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java @@ -64,7 +64,9 @@ public class GuardianController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java index 15521ccf5..7e2593b23 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java @@ -64,7 +64,9 @@ public class GuardianElderController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java index ea8721802..2fcda9550 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java @@ -91,7 +91,9 @@ public class HorseController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java index df7d32f8d..cec0508ce 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java @@ -91,7 +91,9 @@ public class HorseDonkeyController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java index b699ebb36..858607a8b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java @@ -91,7 +91,9 @@ public class HorseMuleController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java index b66483126..ee9c94c9c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java @@ -92,7 +92,9 @@ public class HorseSkeletonController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java index db1fe9cf5..779b32f2b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java @@ -92,7 +92,9 @@ public class HorseZombieController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java index 293becae7..581c1fe40 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java @@ -61,7 +61,9 @@ public class IllusionerController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java index 7c421284c..87d911f80 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java @@ -61,7 +61,9 @@ public class IronGolemController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java index 1d62fe52b..b1753ee11 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java @@ -84,7 +84,9 @@ public class LlamaController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java index 824f8afc3..c6311b5da 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java @@ -67,7 +67,9 @@ public class MagmaCubeController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java index 37b54e7af..f49d6d27d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java @@ -75,7 +75,9 @@ public class MushroomCowController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java index 55b53b0b0..507c96085 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java @@ -72,7 +72,9 @@ public class OcelotController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java index 78c08c698..6eebcbc61 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java @@ -54,7 +54,9 @@ public class ParrotController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java index 7bc31aba2..8e2241105 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java @@ -73,7 +73,9 @@ public class PhantomController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java index 142171eee..3ec6e7a76 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java @@ -73,7 +73,9 @@ public class PigController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java index 2c1c01194..385955450 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java @@ -62,7 +62,9 @@ public class PigZombieController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java index 1e40bffdf..791b31cf7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java @@ -63,7 +63,9 @@ public class PolarBearController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java index 84516dd0d..b41e36fe4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java @@ -70,7 +70,9 @@ public class PufferFishController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java index 65d4a8515..6713747ab 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java @@ -74,7 +74,9 @@ public class RabbitController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java index 0e87340a5..c03375387 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java @@ -69,7 +69,9 @@ public class SalmonController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java index f9f31e126..f74370604 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java @@ -72,7 +72,9 @@ public class SheepController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java index 9d1f2ad2d..de49a3419 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java @@ -65,7 +65,9 @@ public class ShulkerController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java index 97eec3a30..29e9377e8 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java @@ -61,7 +61,9 @@ public class SilverfishController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java index 289ee0516..8143391f7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java @@ -61,7 +61,9 @@ public class SkeletonController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java index de355d8ab..fe1b3ea43 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java @@ -61,7 +61,9 @@ public class SkeletonStrayController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java index 908f06f66..49456695c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java @@ -61,7 +61,9 @@ public class SkeletonWitherController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java index 18bf11410..53f8fb63d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java @@ -67,7 +67,9 @@ public class SlimeController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java index 03e08c23b..265828d26 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java @@ -64,7 +64,9 @@ public class SnowmanController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java index 4bdc33130..ac9c880ef 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java @@ -61,7 +61,9 @@ public class SpiderController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java index f254c8bd3..b0ea5d5b0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java @@ -61,7 +61,9 @@ public class SquidController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java index 89c60620a..482abb4b0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java @@ -69,7 +69,9 @@ public class TropicalFishController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java index 94012314a..1d97bc191 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java @@ -68,7 +68,9 @@ public class TurtleController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java index 0f30e4b75..380ff240c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java @@ -55,7 +55,9 @@ public class VexController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java index 1001fed6f..5e9ecb3ee 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java @@ -80,7 +80,9 @@ public class VillagerController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java index 3fded1d94..c8773f6a6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java @@ -72,7 +72,9 @@ public class VindicatorController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java index 99604ea4a..6966d20ac 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java @@ -61,7 +61,9 @@ public class WitchController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java index b62466ff9..e83a6e526 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java @@ -52,7 +52,9 @@ public class WitherController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java index 52b158788..69070719e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java @@ -74,7 +74,9 @@ public class WolfController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java index 31e0f60c7..3c2272ef2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java @@ -61,7 +61,9 @@ public class ZombieController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java index d2a44d4b6..32403db70 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java @@ -61,7 +61,9 @@ public class ZombieHuskController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java index 3d32926f1..b936ccac9 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java @@ -61,7 +61,9 @@ public class ZombieVillagerController extends MobEntityController { 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_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java index ebd0ffdda..cb132bb9c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java @@ -112,7 +112,8 @@ public class PlayerNavigation extends NavigationAbstract { if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { PathType localPathType = this.o.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5, paramInt6, true, true); - if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) || (localPathType == PathType.OPEN)) { + if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA) + || (localPathType == PathType.OPEN)) { return false; } localPathType = this.o.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true, diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java index 919512ab7..5dc32956b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java @@ -71,7 +71,9 @@ public class BatController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java index 3c8351c72..4c01dc4bb 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java @@ -68,7 +68,9 @@ public class BlazeController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java index cc1d341c4..80eee3cb9 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java @@ -90,7 +90,9 @@ public class CatController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java index e852e7dda..401859f0c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java @@ -77,7 +77,9 @@ public class CaveSpiderController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java index c6a7056db..b96674a77 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java @@ -91,7 +91,9 @@ public class ChickenController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java index c0e2ae27a..28d4990bb 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java @@ -85,7 +85,9 @@ public class CodController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java index 632ec2707..3889652c0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java @@ -94,7 +94,9 @@ public class CowController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java index ac521b5d5..6d165da81 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java @@ -80,7 +80,9 @@ public class CreeperController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java index 996e84450..431136177 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java @@ -84,7 +84,9 @@ public class DolphinController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java index 4892cb3be..f0ea75f0a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java @@ -77,7 +77,9 @@ public class DrownedController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java index 491c6393a..4ed0620ac 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java @@ -68,7 +68,9 @@ public class EnderDragonController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java index d1b986830..8b733c1b4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java @@ -85,7 +85,9 @@ public class EndermanController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java index 92c7fcdce..3080151a0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java @@ -77,7 +77,9 @@ public class EndermiteController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java index 0b3a7b4a1..091649a94 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java @@ -63,7 +63,9 @@ public class EvokerController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java index ecf11098b..43c2ad42a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java @@ -76,7 +76,9 @@ public class FoxController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java index b2ffb93a5..a556c98bf 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java @@ -54,7 +54,9 @@ public class GhastController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java index 596426914..46ed87c71 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java @@ -63,7 +63,9 @@ public class GiantController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java index 94f1c631a..6a7492601 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java @@ -63,7 +63,9 @@ public class GuardianController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java index 3f95a3ecb..11d245d18 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java @@ -63,7 +63,9 @@ public class GuardianElderController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java index 896edb3fb..80d816e00 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java @@ -96,7 +96,9 @@ public class HorseController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java index 8e11d9966..0e5847215 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java @@ -95,7 +95,9 @@ public class HorseDonkeyController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java index b8c19d495..c87496ecd 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java @@ -95,7 +95,9 @@ public class HorseMuleController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java index f82937b3b..3f75fd20e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java @@ -96,7 +96,9 @@ public class HorseSkeletonController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java index 0749a5a44..d5349b9b3 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java @@ -96,7 +96,9 @@ public class HorseZombieController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java index c7a35a66c..f70e892c8 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java @@ -63,7 +63,9 @@ public class IllusionerController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java index 76770aed6..386ed0eb7 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java @@ -63,7 +63,9 @@ public class IronGolemController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java index 37d7a746f..f5c35d816 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java @@ -89,7 +89,9 @@ public class LlamaController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java index 9776cd836..bc13ab798 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java @@ -69,7 +69,9 @@ public class MagmaCubeController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java index 6dd7d6659..1ef887160 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java @@ -80,7 +80,9 @@ public class MushroomCowController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java index 5d28a8b14..d5e55d67c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java @@ -77,7 +77,9 @@ public class OcelotController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java index 301abcbf7..55e17afcf 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java @@ -76,7 +76,9 @@ public class PandaController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java index 20ccb48c4..640621402 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java @@ -56,7 +56,9 @@ public class ParrotController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java index ec87457c0..c292c2e4b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java @@ -72,7 +72,9 @@ public class PhantomController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java index 5a6a9b212..2c598031c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java @@ -78,7 +78,9 @@ public class PigController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java index 1f9e4f115..b47edbb0a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java @@ -64,7 +64,9 @@ public class PigZombieController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java index fbe4ed3af..6f824ee82 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java @@ -76,7 +76,9 @@ public class PillagerController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java index c31cb1b5c..1049a5c86 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java @@ -68,7 +68,9 @@ public class PolarBearController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java index b02d34ce7..ceeb75843 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java @@ -74,7 +74,9 @@ public class PufferFishController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java index 2711d3cc7..3ebe61a36 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java @@ -79,7 +79,9 @@ public class RabbitController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java index 8935a0e47..fce84ab71 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java @@ -76,7 +76,9 @@ public class RavagerController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java index ca9338bd4..227e84e48 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java @@ -71,7 +71,9 @@ public class SalmonController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java index 7cb8167b2..91630ba88 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java @@ -77,7 +77,9 @@ public class SheepController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java index fa8876f08..9f3012fe4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java @@ -64,7 +64,9 @@ public class ShulkerController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java index a4ed0ba52..8aaf8c8ab 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java @@ -63,7 +63,9 @@ public class SilverfishController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java index ae97f42c0..121ef6aa1 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java @@ -63,7 +63,9 @@ public class SkeletonController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java index f10912320..dcb878e72 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java @@ -63,7 +63,9 @@ public class SkeletonStrayController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java index aa7050bde..a739ecb1b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java @@ -63,7 +63,9 @@ public class SkeletonWitherController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java index b1f6871f5..f332f6d06 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java @@ -69,7 +69,9 @@ public class SlimeController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java index 8aea4e962..8563a75d4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java @@ -64,7 +64,9 @@ public class SnowmanController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java index 1eb31a2d0..d3567db68 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java @@ -63,7 +63,9 @@ public class SpiderController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java index 9f0fd9d98..efe973075 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java @@ -63,7 +63,9 @@ public class SquidController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java index 79b46722c..6e289ecbe 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java @@ -92,7 +92,9 @@ public class TraderLlamaController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java index 57a11dc2f..ffe5d2d19 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java @@ -71,7 +71,9 @@ public class TropicalFishController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java index b19826ea8..b343fbdf0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java @@ -70,7 +70,9 @@ public class TurtleController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java index a9b902d03..c50488f36 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java @@ -57,7 +57,9 @@ public class VexController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java index c01ff2583..84cb2a028 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java @@ -89,7 +89,9 @@ public class VillagerController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java index d05fca462..82b4ec30d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java @@ -77,7 +77,9 @@ public class VindicatorController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java index f96860a25..3963a9246 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java @@ -88,7 +88,9 @@ public class WanderingTraderController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java index 30a4e22b3..b4e08ae04 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java @@ -63,7 +63,9 @@ public class WitchController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java index b2450cea6..61e053325 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java @@ -54,7 +54,9 @@ public class WitherController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java index 15504c179..e5c6438b1 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java @@ -79,7 +79,9 @@ public class WolfController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java index 0b8e730de..4bfda7c61 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java @@ -63,7 +63,9 @@ public class ZombieController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java index 2c21866b2..3f8cdfc8d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java @@ -63,7 +63,9 @@ public class ZombieHuskController extends MobEntityController { 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_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java index 7da6a883e..5498f2f59 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java @@ -63,7 +63,9 @@ public class ZombieVillagerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java index 7f0bf665c..69460c8fb 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java @@ -64,7 +64,9 @@ public class BatController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java index a10b2a251..a8a3419a2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java @@ -61,7 +61,9 @@ public class BeeController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java index e42f270d1..6fa4fb6d8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java @@ -61,7 +61,9 @@ public class BlazeController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java index 6f1c1c760..6d57e02a3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java @@ -83,7 +83,9 @@ public class CatController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java index fc12ebeeb..35850a24d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java @@ -70,7 +70,9 @@ public class CaveSpiderController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java index e3d7827e8..395351032 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java @@ -84,7 +84,9 @@ public class ChickenController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java index 9784ccaad..acbae75a4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java @@ -82,7 +82,9 @@ public class CodController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java index e7742e570..9142a29e6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java @@ -87,7 +87,9 @@ public class CowController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java index f3aad91a9..34ee8ba6b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java @@ -73,7 +73,9 @@ public class CreeperController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java index e6ab8f549..97e8c1caf 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java @@ -81,7 +81,9 @@ public class DolphinController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java index 1100224da..b1354ca2a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java @@ -70,7 +70,9 @@ public class DrownedController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java index bd2314b64..9591d2538 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java @@ -61,7 +61,9 @@ public class EnderDragonController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java index 3b0a60c70..c38e9cad2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java @@ -78,7 +78,9 @@ public class EndermanController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java index 2ccf46ecb..d90c36d08 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java @@ -70,7 +70,9 @@ public class EndermiteController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java index f64a300f7..99bd7ffa8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java @@ -64,7 +64,9 @@ public class EvokerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java index 3b5757fff..174e7d315 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java @@ -77,7 +77,9 @@ public class FoxController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java index af2fc07f2..13cc60c03 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java @@ -55,7 +55,9 @@ public class GhastController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java index 89f060336..b9a7d55fe 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java @@ -64,7 +64,9 @@ public class GiantController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java index 6c17aa23e..ebed2119b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java @@ -64,7 +64,9 @@ public class GuardianController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java index b994d4d9a..d00fb17cc 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java @@ -64,7 +64,9 @@ public class GuardianElderController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java index 1dc658761..bc710ac5d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java @@ -97,7 +97,9 @@ public class HorseController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java index e7c5b0c83..bc5a63f5e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java @@ -96,7 +96,9 @@ public class HorseDonkeyController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java index 571c790e5..8e1c4a211 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java @@ -96,7 +96,9 @@ public class HorseMuleController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java index 8faeae362..8e100719f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java @@ -97,7 +97,9 @@ public class HorseSkeletonController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java index 4777fce79..6d3b7ac18 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java @@ -97,7 +97,9 @@ public class HorseZombieController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java index bcafed270..43a5fb6b2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java @@ -64,7 +64,9 @@ public class IllusionerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java index 846ad69f1..36fd28a68 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java @@ -64,7 +64,9 @@ public class IronGolemController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java index 4c180d0d7..4c9783ca5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java @@ -90,7 +90,9 @@ public class LlamaController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java index fc107e38e..0463e9147 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java @@ -74,7 +74,9 @@ public class MagmaCubeController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java index 30ca1bc78..6d4678705 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java @@ -81,7 +81,9 @@ public class MushroomCowController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java index 13b9aebc2..e2b377df9 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java @@ -79,7 +79,9 @@ public class OcelotController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java index d95016ecb..cb548d6d7 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java @@ -77,7 +77,9 @@ public class PandaController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java index 585b3c27e..05aa74305 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java @@ -57,7 +57,9 @@ public class ParrotController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java index c697be8bb..cac694d00 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java @@ -80,7 +80,9 @@ public class PhantomController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java index dc70e1b11..793be2934 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java @@ -79,7 +79,9 @@ public class PigController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java index 058c6dae6..0c9e9a5a0 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java @@ -65,7 +65,9 @@ public class PigZombieController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java index 447f07755..4cafc23c7 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java @@ -77,7 +77,9 @@ public class PillagerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java index 3bf7c3913..07a3c8a27 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java @@ -69,7 +69,9 @@ public class PolarBearController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java index 27b0cfdaa..f1c62220c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java @@ -79,7 +79,9 @@ public class PufferFishController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java index 4c05f7739..987934572 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java @@ -80,7 +80,9 @@ public class RabbitController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java index ba43b34e4..f97eac644 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java @@ -77,7 +77,9 @@ public class RavagerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java index 09b479b17..fd47809bf 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java @@ -76,7 +76,9 @@ public class SalmonController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java index 8c6c9c54a..89946bc83 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java @@ -78,7 +78,9 @@ public class SheepController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java index 36cc1198e..495f0218a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java @@ -65,7 +65,9 @@ public class ShulkerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java index 19e951e56..63fa6a80a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java @@ -64,7 +64,9 @@ public class SilverfishController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java index 9e20a9818..d5144941f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java @@ -64,7 +64,9 @@ public class SkeletonController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java index b6662994f..883c69cb1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java @@ -64,7 +64,9 @@ public class SkeletonStrayController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java index 76bd624b6..9e51e9d88 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java @@ -64,7 +64,9 @@ public class SkeletonWitherController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java index 0c68c6c45..a0fbe891a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java @@ -74,7 +74,9 @@ public class SlimeController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java index 49cf9cd7f..633ff8e89 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java @@ -65,7 +65,9 @@ public class SnowmanController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java index 57d408f0d..041500906 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java @@ -64,7 +64,9 @@ public class SpiderController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java index f93b6fa93..2561f41e8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java @@ -64,7 +64,9 @@ public class SquidController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java index 78dcff883..9d44e28e1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java @@ -93,7 +93,9 @@ public class TraderLlamaController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java index 0dd3d3050..97a80bfee 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java @@ -76,7 +76,9 @@ public class TropicalFishController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java index a51059c61..f091e8941 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java @@ -78,7 +78,9 @@ public class TurtleController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java index 6d7693335..6d4ad305f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java @@ -58,7 +58,9 @@ public class VexController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java index 0ffa4bb66..77ee083c0 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java @@ -90,7 +90,9 @@ public class VillagerController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java index 9a0ee09bc..78c9c5a94 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java @@ -78,7 +78,9 @@ public class VindicatorController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java index ececf0e70..e852a4420 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java @@ -87,7 +87,9 @@ public class WanderingTraderController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java index c871845d3..00c60510c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java @@ -63,7 +63,9 @@ public class WitchController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java index 8aebc44f4..b277f5571 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java @@ -55,7 +55,9 @@ public class WitherController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java index 276ed96c3..0003f6c57 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java @@ -80,7 +80,9 @@ public class WolfController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java index 6cdfa6f04..197e55c35 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java @@ -64,7 +64,9 @@ public class ZombieController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java index b650afaaa..d27207766 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java @@ -64,7 +64,9 @@ public class ZombieHuskController extends MobEntityController { 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_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java index 7088334ff..a58343602 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java @@ -64,7 +64,9 @@ public class ZombieVillagerController extends MobEntityController { 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_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java index 2cdf79bd9..118580e1d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java @@ -64,7 +64,9 @@ public class BatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 719c40159..55f6d3bc5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java @@ -61,7 +61,9 @@ public class BeeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java index 561d64d80..544acf279 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java @@ -61,7 +61,9 @@ public class BlazeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java index 28e20fde4..7c8fbf1dc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java @@ -83,7 +83,9 @@ public class CatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index e77676bc2..9311f2b02 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java @@ -70,7 +70,9 @@ public class CaveSpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java index ae9844c51..6308ae236 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java @@ -84,7 +84,9 @@ public class ChickenController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java index 22198c8e9..1c01d7739 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java @@ -83,7 +83,9 @@ public class CodController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java index 5e3297098..4912250cd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java @@ -88,7 +88,9 @@ public class CowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java index 21c2c58ca..c075173c0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java @@ -74,7 +74,9 @@ public class CreeperController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java index cb1bc4e5c..b627441e1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java @@ -81,7 +81,9 @@ public class DolphinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java index a20ccaef3..9de52c609 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java @@ -70,7 +70,9 @@ public class DrownedController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index 45d969cec..a1f96c20e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java @@ -61,7 +61,9 @@ public class EnderDragonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java index b0b91490e..d6e073cb7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java @@ -78,7 +78,9 @@ public class EndermanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java index 3a0588f71..08ba8dff3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java @@ -70,7 +70,9 @@ public class EndermiteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java index cb67bf80e..1074e8481 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java @@ -64,7 +64,9 @@ public class EvokerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java index 7211a5076..764945b45 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java @@ -77,7 +77,9 @@ public class FoxController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java index 3138de8d4..ae75c8486 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java @@ -55,7 +55,9 @@ public class GhastController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java index 4a4e5d925..026e0b6ba 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java @@ -64,7 +64,9 @@ public class GiantController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java index 0d0a51ba3..e8866eca0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java @@ -64,7 +64,9 @@ public class GuardianController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java index 1e40b02e3..a5386660f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java @@ -64,7 +64,9 @@ public class GuardianElderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java index 2bba9631a..666aee3a6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java @@ -64,7 +64,9 @@ public class HoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java index 82b359aa0..090d42ca1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java @@ -97,7 +97,9 @@ public class HorseController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java index 8ca5f5d47..232ca76af 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java @@ -95,7 +95,9 @@ public class HorseDonkeyController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java index 4f9398f8f..0efe6450c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java @@ -96,7 +96,9 @@ public class HorseMuleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java index 1b4216ac6..c1655a56d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java @@ -97,7 +97,9 @@ public class HorseSkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java index 47d88bb38..82bddbc6a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java @@ -97,7 +97,9 @@ public class HorseZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java index faeed0ec7..581db310e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java @@ -64,7 +64,9 @@ public class IllusionerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java index 736dcf5c3..4a39c302f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java @@ -64,7 +64,9 @@ public class IronGolemController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java index 258cf0cff..7121b96e5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java @@ -90,7 +90,9 @@ public class LlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java index 3dfa53ebb..9c834df74 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java @@ -74,7 +74,9 @@ public class MagmaCubeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java index ad1503e75..be400331f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java @@ -82,7 +82,9 @@ public class MushroomCowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java index 79b96c999..5be019647 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java @@ -79,7 +79,9 @@ public class OcelotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java index 38332ff77..46cdb7106 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java @@ -77,7 +77,9 @@ public class PandaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index 7961b986c..7f48cf4a7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java @@ -58,7 +58,9 @@ public class ParrotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java index 988a2753b..b007564cc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java @@ -95,7 +95,9 @@ public class PhantomController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java index a20e00e0a..60b49dbde 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java @@ -80,7 +80,9 @@ public class PigController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java index 71b09fe77..ae33114ba 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java @@ -65,7 +65,9 @@ public class PigZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java index 8fefb02c6..6635747b5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java @@ -64,7 +64,9 @@ public class PiglinBruteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java index f3eb71e91..8774b4acb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java @@ -64,7 +64,9 @@ public class PiglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java index 94a56db6c..eefaf3302 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java @@ -77,7 +77,9 @@ public class PillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index 979ecc09a..e23e66bda 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java @@ -69,7 +69,9 @@ public class PolarBearController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java index 55f7dcba8..d661ff936 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java @@ -88,7 +88,9 @@ public class PufferFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java index f12567121..9fc2fea07 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java @@ -80,7 +80,9 @@ public class RabbitController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java index 8a0a1943e..f2e79ac08 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java @@ -77,7 +77,9 @@ public class RavagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java index 6d29e1b75..295493275 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java @@ -77,7 +77,9 @@ public class SalmonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java index def9a030c..79b03fc5a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java @@ -78,7 +78,9 @@ public class SheepController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java index 13a294d5d..49b8adbdf 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java @@ -65,7 +65,9 @@ public class ShulkerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java index 487d95d06..88c10a67d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java @@ -64,7 +64,9 @@ public class SilverfishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java index a596ebd72..f7603e97a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java @@ -64,7 +64,9 @@ public class SkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java index a06b1e054..0f63332e7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java @@ -64,7 +64,9 @@ public class SkeletonStrayController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java index d7f63c86b..7c7a8f4d2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java @@ -64,7 +64,9 @@ public class SkeletonWitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java index f56d93a6b..b805f9bb7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java @@ -74,7 +74,9 @@ public class SlimeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java index 6d7c70e9e..20acd15fc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java @@ -65,7 +65,9 @@ public class SnowmanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java index f9791e0e7..5e06ef570 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java @@ -64,7 +64,9 @@ public class SpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java index 3e7de5e0d..60de0fc02 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java @@ -64,7 +64,9 @@ public class SquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java index e12d16eed..ff8818bb0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java @@ -64,7 +64,9 @@ public class StriderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java index 95a54a87b..a786c2b8e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java @@ -93,7 +93,9 @@ public class TraderLlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java index d0ac6b3e1..5636ff28a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java @@ -77,7 +77,9 @@ public class TropicalFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java index df1c70441..eacb30841 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java @@ -78,7 +78,9 @@ public class TurtleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index 1e10f847a..638344b6e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java @@ -58,7 +58,9 @@ public class VexController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java index af02e98c4..f6ac0fd34 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java @@ -92,7 +92,9 @@ public class VillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java index 5ab5dfdf6..d7097b4aa 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java @@ -78,7 +78,9 @@ public class VindicatorController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java index 0746217ae..628472faa 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java @@ -89,7 +89,9 @@ public class WanderingTraderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java index dc7968aa3..9b24fdb05 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java @@ -64,7 +64,9 @@ public class WitchController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java index e1849bc76..6e3754e7e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java @@ -55,7 +55,9 @@ public class WitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java index cfa22bc58..f223e3c47 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java @@ -80,7 +80,9 @@ public class WolfController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java index fea34091d..4c77b6949 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java @@ -64,7 +64,9 @@ public class ZoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java index d57744476..102ccb023 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java @@ -64,7 +64,9 @@ public class ZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java index 14436ea02..7d1e2a9ce 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java @@ -64,7 +64,9 @@ public class ZombieHuskController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java index 2d7950e0a..6ceb35fc6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java @@ -64,7 +64,9 @@ public class ZombieVillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.a((float)event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.a((float) event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java index 79ea15dc6..a42c90399 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java @@ -165,7 +165,9 @@ public class AxolotlController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java index f0fe005d4..1177c9a5f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java @@ -146,7 +146,9 @@ public class BatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java index 4f5589889..50422c7a6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java @@ -143,7 +143,9 @@ public class BeeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java index 0561ee189..5dcd12e15 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java @@ -137,7 +137,9 @@ public class BlazeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java index e8aad4be7..9ff0a1d64 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java @@ -158,7 +158,9 @@ public class CatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java index f21c53ff2..272fe9e23 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java @@ -157,7 +157,9 @@ public class CaveSpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java index ca2633863..7b2a610e7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java @@ -166,7 +166,9 @@ public class ChickenController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java index 27aa6a00e..5c55a9578 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java @@ -191,7 +191,9 @@ public class CodController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java index 62892ec8b..278cb6e9a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java @@ -163,7 +163,9 @@ public class CowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java index 31bc7a6c4..8fe8a5236 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java @@ -159,7 +159,9 @@ public class CreeperController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java index ae16ea7aa..2211b2372 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java @@ -157,7 +157,9 @@ public class DolphinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java index 6a2acaa1d..996383ec3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java @@ -155,7 +155,9 @@ public class DrownedController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java index 817ecb5ea..877bd9d01 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java @@ -153,7 +153,9 @@ public class EnderDragonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java index 32dfa839d..0b232be4a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java @@ -162,7 +162,9 @@ public class EndermanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java index db206560c..61c4714d3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java @@ -155,7 +155,9 @@ public class EndermiteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java index b7da6c8ab..23dc71aca 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java @@ -149,7 +149,9 @@ public class EvokerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java index d0e38f82d..865b094ca 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java @@ -152,7 +152,9 @@ public class FoxController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java index 2f0deb6a0..97e6f7f51 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java @@ -137,7 +137,9 @@ public class GhastController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java index f3559a4f2..6f281bf61 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java @@ -149,7 +149,9 @@ public class GiantController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java index 771ae128e..5ccb9f650 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java @@ -149,7 +149,9 @@ public class GlowSquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java index d827990da..16e381e2e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java @@ -152,7 +152,9 @@ public class GoatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java index d89fae09f..83929c84b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java @@ -155,7 +155,9 @@ public class GuardianController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java index 240b611e0..086648cfd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java @@ -155,7 +155,9 @@ public class GuardianElderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java index 9956d2997..bcccdf591 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java @@ -152,7 +152,9 @@ public class HoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java index 972ff09a6..529d177f9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java @@ -200,7 +200,9 @@ public class HorseController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java index eaebd8322..9e1a2d6e9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java @@ -199,7 +199,9 @@ public class HorseDonkeyController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java index c525a2d71..cc88071be 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java @@ -199,7 +199,9 @@ public class HorseMuleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java index bff5ed5dc..ab1e01736 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java @@ -199,7 +199,9 @@ public class HorseSkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java index f811ac633..7b9c1bddd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java @@ -199,7 +199,9 @@ public class HorseZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java index c870cbef3..da53a4ce0 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java @@ -149,7 +149,9 @@ public class IllusionerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java index 593d35d15..c20a8f6fa 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java @@ -149,7 +149,9 @@ public class IronGolemController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java index a235e6f6d..2ebe4690b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java @@ -170,7 +170,9 @@ public class LlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java index 6816ff8a0..b181ff058 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java @@ -150,7 +150,9 @@ public class MagmaCubeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java index 2b2cf9f91..8606b3f40 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java @@ -155,7 +155,9 @@ public class MushroomCowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java index 5a7656f37..3c267caa9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java @@ -158,7 +158,9 @@ public class OcelotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java index 9b3518416..5d75f82f1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java @@ -152,7 +152,9 @@ public class PandaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java index 18d7d0931..93822ae6f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java @@ -142,7 +142,9 @@ public class ParrotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java index 2622464b4..7237f8a8b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java @@ -188,7 +188,9 @@ public class PhantomController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java index c58f88e31..bd781fa04 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java @@ -160,7 +160,9 @@ public class PigController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java index b15d791b8..901eb2018 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java @@ -150,7 +150,9 @@ public class PigZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java index 17c9c954f..c2cbdd590 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java @@ -152,7 +152,9 @@ public class PiglinBruteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java index 2dad7d208..7ddb61252 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java @@ -152,7 +152,9 @@ public class PiglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java index de6073e6f..b64b7ff7e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java @@ -152,7 +152,9 @@ public class PillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java index 5c185cdcb..c3b4b7b62 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java @@ -136,7 +136,9 @@ public class PolarBearController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java index 303291f20..2ca0d0d68 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java @@ -194,7 +194,9 @@ public class PufferFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java index 113cbdbbd..0a7746145 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java @@ -162,7 +162,9 @@ public class RabbitController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java index 9022c0ee9..d74beddc9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java @@ -152,7 +152,9 @@ public class RavagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java index c9eeeb859..01588423d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java @@ -183,7 +183,9 @@ public class SalmonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java index 2e53d756b..ba3ce239b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java @@ -152,7 +152,9 @@ public class SheepController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java index bc6d4ef8a..a410f4dfd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java @@ -153,7 +153,9 @@ public class ShulkerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java index 6b2aa47b1..433b61109 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java @@ -147,7 +147,9 @@ public class SilverfishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java index abf266d79..33f52b8ad 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java @@ -149,7 +149,9 @@ public class SkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java index 6a7480ff5..e9c974701 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java @@ -149,7 +149,9 @@ public class SkeletonStrayController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java index dd419ce62..6dcfc70fd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java @@ -149,7 +149,9 @@ public class SkeletonWitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java index 017301852..1c5aaa1d4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java @@ -150,7 +150,9 @@ public class SlimeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java index 1067cce3a..65dc9ec08 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java @@ -162,7 +162,9 @@ public class SnowmanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java index e1c6780d3..a76ae0535 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java @@ -149,7 +149,9 @@ public class SpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java index 60e1f4995..cd8e93fa2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java @@ -149,7 +149,9 @@ public class SquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java index 8537fcd94..3f149dd1c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java @@ -149,7 +149,9 @@ public class StriderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java index 230cdacee..47fe0ac62 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java @@ -171,7 +171,9 @@ public class TraderLlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java index 1070bde65..d24e1d83d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java @@ -185,7 +185,9 @@ public class TropicalFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java index f9efc022e..8c493b4b1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java @@ -171,7 +171,9 @@ public class TurtleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java index 34bf89db6..907773b92 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java @@ -136,7 +136,9 @@ public class VexController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java index 7d860b2df..5ed444f76 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java @@ -175,7 +175,9 @@ public class VillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java index d89364d06..ec8b462b4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java @@ -152,7 +152,9 @@ public class VindicatorController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java index df211fa59..d0caa0292 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java @@ -176,7 +176,9 @@ public class WanderingTraderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java index 7a92041e3..fabc487fc 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java @@ -149,7 +149,9 @@ public class WitchController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java index 424e74ddc..a79f430a2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java @@ -147,7 +147,9 @@ public class WitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java index 673de516d..148f34390 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java @@ -154,7 +154,9 @@ public class WolfController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java index 024bc3a2b..037d7791f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java @@ -151,7 +151,9 @@ public class ZoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java index a46a13874..6c20e5107 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java @@ -149,7 +149,9 @@ public class ZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java index 34357cfae..3398cbfbb 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java @@ -149,7 +149,9 @@ public class ZombieHuskController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java index 4eed99fa2..20e2ad665 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java @@ -149,7 +149,9 @@ public class ZombieVillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java index 2ed48d707..07f8fb3d2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java @@ -165,7 +165,9 @@ public class AxolotlController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java index 89a8b202e..cb450003d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java @@ -148,7 +148,9 @@ public class BatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java index 7db97ff75..f6cdcbc11 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java @@ -145,7 +145,9 @@ public class BeeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java index c4873701e..4484e6350 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java @@ -139,7 +139,9 @@ public class BlazeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java index 19e647acb..7177065ec 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java @@ -159,7 +159,9 @@ public class CatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java index 8f27686e9..ccf96ed5e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java @@ -158,7 +158,9 @@ public class CaveSpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java index e2da5e7be..7ec722b72 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java @@ -167,7 +167,9 @@ public class ChickenController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java index 71e2e1208..0ca01ad6a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java @@ -192,7 +192,9 @@ public class CodController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java index 03a821790..c21cc8492 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java @@ -164,7 +164,9 @@ public class CowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java index c684fe7ef..8935f2e78 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java @@ -159,7 +159,9 @@ public class CreeperController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java index b302724b7..cfe70113d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java @@ -157,7 +157,9 @@ public class DolphinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java index d9b59f02d..8b1d0a6fb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java @@ -156,7 +156,9 @@ public class DrownedController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java index 944c43713..56a80125c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java @@ -155,7 +155,9 @@ public class EnderDragonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java index babf2badb..17e5e3af5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java @@ -159,7 +159,9 @@ public class EndermanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java index a5705df46..e39d34b48 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java @@ -156,7 +156,9 @@ public class EndermiteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java index fc8cfd1a1..dbeb88aff 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java @@ -150,7 +150,9 @@ public class EvokerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java index e56ed0123..fd9978b0d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java @@ -153,7 +153,9 @@ public class FoxController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java index 7c879dad8..a9873e076 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java @@ -139,7 +139,9 @@ public class GhastController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java index 80e7b3778..2e1ae061b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java @@ -150,7 +150,9 @@ public class GiantController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java index 5e1035685..a162f3986 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java @@ -150,7 +150,9 @@ public class GlowSquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java index 6dbf2345f..262523533 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java @@ -153,7 +153,9 @@ public class GoatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java index ddf5cccaf..417b0d0a9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java @@ -156,7 +156,9 @@ public class GuardianController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java index 215aae16b..c10a027c3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java @@ -156,7 +156,9 @@ public class GuardianElderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java index e7aae83c1..beee6af04 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java @@ -153,7 +153,9 @@ public class HoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java index b6ea1d00f..d13f2d5e0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java @@ -201,7 +201,9 @@ public class HorseController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java index 213938c8f..4d8bcbe75 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java @@ -200,7 +200,9 @@ public class HorseDonkeyController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java index 770535694..1b839a62f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java @@ -200,7 +200,9 @@ public class HorseMuleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java index be95e6687..6bd30d8d3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java @@ -200,7 +200,9 @@ public class HorseSkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java index c43f9fce5..d2d4a8a7c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java @@ -200,7 +200,9 @@ public class HorseZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java index f03b0c78d..d885cc043 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java @@ -150,7 +150,9 @@ public class IllusionerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java index e5c3ba27a..2d8d1f7e7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java @@ -150,7 +150,9 @@ public class IronGolemController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java index 92d38f61d..ab255fd2d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java @@ -171,7 +171,9 @@ public class LlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java index 39521b658..3a4cbca68 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java @@ -151,7 +151,9 @@ public class MagmaCubeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java index 2fbe6b5e4..08ca2433f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java @@ -156,7 +156,9 @@ public class MushroomCowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java index 9d3efcd8b..21da6bb81 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java @@ -159,7 +159,9 @@ public class OcelotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java index a4929b7a1..c907ff576 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java @@ -153,7 +153,9 @@ public class PandaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java index 6f350e010..542f1c19b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java @@ -144,7 +144,9 @@ public class ParrotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java index 67f0f5e74..827a62c55 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java @@ -189,7 +189,9 @@ public class PhantomController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java index e84d62572..1d41a87df 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java @@ -160,7 +160,9 @@ public class PigController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java index 531113cf8..c2944a39c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java @@ -151,7 +151,9 @@ public class PigZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java index 1b169c20b..695349dce 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java @@ -153,7 +153,9 @@ public class PiglinBruteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java index 2ed4247da..02ab2313f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java @@ -153,7 +153,9 @@ public class PiglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java index f71547ccb..a57aa9de8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java @@ -153,7 +153,9 @@ public class PillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java index 12aae35fb..e74b132f3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java @@ -138,7 +138,9 @@ public class PolarBearController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java index 6a91d5739..6e9db4f6f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java @@ -195,7 +195,9 @@ public class PufferFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java index 09ef18bb9..3491600ad 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java @@ -163,7 +163,9 @@ public class RabbitController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java index b388ce1ae..f7d1182f4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java @@ -158,7 +158,9 @@ public class RavagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java index 131814496..b0ed28405 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java @@ -184,7 +184,9 @@ public class SalmonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java index d46d1d9ac..033359c34 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java @@ -153,7 +153,9 @@ public class SheepController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java index 5c60e9cae..ad27dce05 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java @@ -154,7 +154,9 @@ public class ShulkerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java index fea5f5ce5..0750b1854 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java @@ -148,7 +148,9 @@ public class SilverfishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java index 3b0062186..ad8ee4af9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java @@ -150,7 +150,9 @@ public class SkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java index 89d6dede0..e5f46d240 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java @@ -150,7 +150,9 @@ public class SkeletonStrayController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java index 70daf7521..54b64ef2d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java @@ -150,7 +150,9 @@ public class SkeletonWitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java index 30f67fd97..791252fcb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java @@ -151,7 +151,9 @@ public class SlimeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java index 68ece1d36..59f97ad16 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java @@ -163,7 +163,9 @@ public class SnowmanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java index 20cb737d3..f17b462da 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java @@ -150,7 +150,9 @@ public class SpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java index aa959f501..a2efce7dd 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java @@ -150,7 +150,9 @@ public class SquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java index 4cad668fc..6e65407c0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java @@ -150,7 +150,9 @@ public class StriderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java index 4470f8593..78de32280 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java @@ -172,7 +172,9 @@ public class TraderLlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java index 386c420d1..8d457dbbe 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java @@ -186,7 +186,9 @@ public class TropicalFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java index a6db54771..c9ae2be17 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java @@ -172,7 +172,9 @@ public class TurtleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java index 47282d77c..7939162bd 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java @@ -138,7 +138,9 @@ public class VexController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java index ceb2d2bd0..4b5dfb898 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java @@ -175,7 +175,9 @@ public class VillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java index d8fa9f763..cc58bdd6d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java @@ -153,7 +153,9 @@ public class VindicatorController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java index 947ecd4fd..5c6df911d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java @@ -176,7 +176,9 @@ public class WanderingTraderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java index 49211174f..041b66ab8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java @@ -150,7 +150,9 @@ public class WitchController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java index 1116e35db..e2fc36b0c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java @@ -149,7 +149,9 @@ public class WitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java index 6827a653f..50abe68e8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java @@ -155,7 +155,9 @@ public class WolfController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java index c909cfb9a..0a5b5c90d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java @@ -152,7 +152,9 @@ public class ZoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java index ce1ddc453..782b56b2d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java @@ -150,7 +150,9 @@ public class ZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java index 6f7ce608c..3d4c10f85 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java @@ -150,7 +150,9 @@ public class ZombieHuskController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java index 4dbfb2c98..db46b5a9a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java @@ -150,7 +150,9 @@ public class ZombieVillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java index 798b2d1f8..f99e58290 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerNavigation.java @@ -148,7 +148,7 @@ public class PlayerNavigation extends PathNavigation { } return true; } - + private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7, double var9) { int var11 = var0 - var3 / 2; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java index cad8d94aa..a0cea6366 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java @@ -158,7 +158,9 @@ public class AllayController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java index c0804eb66..0e194352d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java @@ -158,7 +158,9 @@ public class AxolotlController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java index f18722592..25c13a668 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java @@ -139,7 +139,9 @@ public class BatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java index 6508dedcf..2e9737de6 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java @@ -136,7 +136,9 @@ public class BeeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java index e0f998c4c..87acfad55 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java @@ -131,7 +131,9 @@ public class BlazeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java index 5b7c7918a..32bfc652f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java @@ -152,7 +152,9 @@ public class CatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java index f3e8a0308..4a98584f4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java @@ -149,7 +149,9 @@ public class CaveSpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java index 530bc4d22..1f315aa46 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java @@ -160,7 +160,9 @@ public class ChickenController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java index ea24e88b7..57867ddfd 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java @@ -185,7 +185,9 @@ public class CodController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java index 15cd1238b..8fbf62340 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java @@ -157,7 +157,9 @@ public class CowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java index 5266ffc41..bdba65aa4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java @@ -152,7 +152,9 @@ public class CreeperController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java index a053410bf..926151ddc 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java @@ -150,7 +150,9 @@ public class DolphinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java index ca3bcf45d..4b5c90df0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java @@ -149,7 +149,9 @@ public class DrownedController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java index 91325bb71..9c3b18d52 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java @@ -147,7 +147,9 @@ public class EnderDragonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java index a8b04e58f..c73bae7d9 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java @@ -152,7 +152,9 @@ public class EndermanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java index a48dbbd87..8912541fe 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java @@ -149,7 +149,9 @@ public class EndermiteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java index b919ec9ba..3a4e68571 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java @@ -392,7 +392,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } private void moveOnCurrentHeading() { diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java index 78ee7b5e3..4f6cb4490 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java @@ -143,7 +143,9 @@ public class EvokerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java index 54b1185ef..9b90a77a3 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java @@ -146,7 +146,9 @@ public class FoxController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java index caadeef9d..f1b400cd1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java @@ -149,7 +149,9 @@ public class FrogController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java index d510086f2..6d8973235 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java @@ -131,7 +131,9 @@ public class GhastController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java index 1756ebf25..d4ed601df 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java @@ -143,7 +143,9 @@ public class GiantController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java index b20fd48da..6aee328ed 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java @@ -143,7 +143,9 @@ public class GlowSquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java index ac97ef4cd..264e68797 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java @@ -146,7 +146,9 @@ public class GoatController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java index fd6ed73dd..3e0d059f2 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java @@ -149,7 +149,9 @@ public class GuardianController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java index 61cd1793a..6e6c2c8db 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java @@ -149,7 +149,9 @@ public class GuardianElderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java index ebdab584f..1fcbb6e50 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java @@ -149,7 +149,9 @@ public class HoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java index d31bbcf70..47a1b6bd5 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java @@ -193,7 +193,9 @@ public class HorseController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java index 3556632ea..18df6763f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java @@ -192,7 +192,9 @@ public class HorseDonkeyController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java index 49bd7f8da..cc78e843e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java @@ -192,7 +192,9 @@ public class HorseMuleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java index 900ea675c..8f886e375 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java @@ -192,7 +192,9 @@ public class HorseSkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java index f249d8475..9cbbc8390 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java @@ -192,7 +192,9 @@ public class HorseZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java index 3765ebd93..dc96bd4cf 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java @@ -143,7 +143,9 @@ public class IllusionerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java index 4ecb9e537..e5013c16f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java @@ -143,7 +143,9 @@ public class IronGolemController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java index 0d9c9a87b..9432ae9de 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java @@ -164,7 +164,9 @@ public class LlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java index 04828bbaf..13b046c74 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java @@ -144,7 +144,9 @@ public class MagmaCubeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java index 6bf16e6d1..5dc1f0872 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java @@ -149,7 +149,9 @@ public class MushroomCowController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java index f972a61b2..059fa7454 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java @@ -152,7 +152,9 @@ public class OcelotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java index ac274027f..bcb419a34 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java @@ -146,7 +146,9 @@ public class PandaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java index f655aea0e..a67cb9c06 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java @@ -135,7 +135,9 @@ public class ParrotController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java index 499fccfc5..8014b9d17 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java @@ -181,7 +181,9 @@ public class PhantomController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java index 9d8f57acf..5f4adc05a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java @@ -153,7 +153,9 @@ public class PigController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java index 2f9e752c0..2a6b2ceac 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java @@ -144,7 +144,9 @@ public class PigZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java index 07700b7ef..d909e8dab 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java @@ -146,7 +146,9 @@ public class PiglinBruteController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java index d22ddea67..36fb54089 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java @@ -146,7 +146,9 @@ public class PiglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java index 4dbf25600..29d2d5305 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java @@ -146,7 +146,9 @@ public class PillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java index 332ee916e..4b41af44b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java @@ -129,7 +129,9 @@ public class PolarBearController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java index 664d5245e..1fc19dbb7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java @@ -188,7 +188,9 @@ public class PufferFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java index 3b415cbf1..d38d55173 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java @@ -156,7 +156,9 @@ public class RabbitController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java index e1f33474c..49c3676dc 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java @@ -151,7 +151,9 @@ public class RavagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java index 4de3edc20..c6dfa4258 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java @@ -177,7 +177,9 @@ public class SalmonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java index 6ec952614..2c113884e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java @@ -146,7 +146,9 @@ public class SheepController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java index 1c1a33435..8664d6e01 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java @@ -147,7 +147,9 @@ public class ShulkerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java index 802cb44a9..c209f4e10 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java @@ -141,7 +141,9 @@ public class SilverfishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java index 7802af062..1910e527e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java @@ -143,7 +143,9 @@ public class SkeletonController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java index 688ee56d4..1fd0671d7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java @@ -143,7 +143,9 @@ public class SkeletonStrayController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java index 4ddeda63c..0dfe1477f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java @@ -143,7 +143,9 @@ public class SkeletonWitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java index 779384851..169203530 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java @@ -144,7 +144,9 @@ public class SlimeController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java index e021903bb..61a5b39d0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java @@ -156,7 +156,9 @@ public class SnowmanController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java index 5cec56330..146dab620 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java @@ -143,7 +143,9 @@ public class SpiderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java index 89f0e2a79..1f981b4b1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java @@ -143,7 +143,9 @@ public class SquidController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java index 722643c2c..ca57aa09f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java @@ -143,7 +143,9 @@ public class StriderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java index 7f22fc847..d088d090d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java @@ -177,7 +177,9 @@ public class TadpoleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java index f012e04b5..079a0db1f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java @@ -165,7 +165,9 @@ public class TraderLlamaController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java index 50f547ff1..57bb32715 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java @@ -179,7 +179,9 @@ public class TropicalFishController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java index 92f4bcd2c..2ba6bc5f7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java @@ -164,7 +164,9 @@ public class TurtleController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java index a4a21fb3c..4acded878 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java @@ -129,7 +129,9 @@ public class VexController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java index dcd28ffd2..c60cdf82e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java @@ -167,7 +167,9 @@ public class VillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java index 7aaba929b..b6abea7b3 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java @@ -146,7 +146,9 @@ public class VindicatorController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java index 9ded5657d..f6394b666 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java @@ -168,7 +168,9 @@ public class WanderingTraderController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java index 875370d51..604876f45 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java @@ -153,7 +153,9 @@ public class WardenController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java index f5c883ace..68153e506 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java @@ -143,7 +143,9 @@ public class WitchController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java index fbb94088e..71b180aad 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java @@ -141,7 +141,9 @@ public class WitherController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java index 6b7abc778..fb1799a9a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java @@ -148,7 +148,9 @@ public class WolfController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java index a99a2cdaf..267f39105 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java @@ -145,7 +145,9 @@ public class ZoglinController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java index 5607e7600..10402dd76 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java @@ -143,7 +143,9 @@ public class ZombieController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java index 7adbd6e50..4256210b8 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java @@ -143,7 +143,9 @@ public class ZombieHuskController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java index ccc4a0d25..a73a5b376 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java @@ -143,7 +143,9 @@ public class ZombieVillagerController extends MobEntityController { NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz); Bukkit.getPluginManager().callEvent(event); Vector kb = event.getKnockbackVector(); - super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + if (!event.isCancelled()) { + super.knockback(event.getStrength(), kb.getX(), kb.getZ()); + } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java index d43d40fcc..c51b74ece 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java @@ -148,7 +148,7 @@ public class PlayerNavigation extends PathNavigation { } return true; } - + private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7, double var9) { int var11 = var0 - var3 / 2; diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java index e713ee7ff..6a6c4047d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java @@ -63,7 +63,9 @@ public class BatController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java index cf72908cc..ebad88582 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java @@ -60,7 +60,9 @@ public class BlazeController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java index 0b1c60eac..6c74175b6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java @@ -69,7 +69,9 @@ public class CaveSpiderController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java index 1cdab6da4..f26605e3a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java @@ -80,7 +80,9 @@ public class ChickenController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java index 163181f8d..ef76b5a8e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java @@ -83,7 +83,9 @@ public class CowController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java index d483b08a8..9ff4b1b61 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java @@ -73,7 +73,9 @@ public class CreeperController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java index 14a3c507a..002d07d54 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java @@ -60,7 +60,9 @@ public class EnderDragonController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java index dbabb7f16..f464d5870 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java @@ -69,7 +69,9 @@ public class EndermanController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java index eddd49900..277940785 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java @@ -69,7 +69,9 @@ public class EndermiteController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java index c2ce59c80..7e1e178c4 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java @@ -46,7 +46,9 @@ public class GhastController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java index 9cdc4e52b..011824c6a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java @@ -55,7 +55,9 @@ public class GiantController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java index 8103d418a..c6cae876a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java @@ -55,7 +55,9 @@ public class GuardianController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java index 0481eacc0..879d2f030 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java @@ -78,7 +78,9 @@ public class HorseController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java index 89a99f247..07658e5b6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java @@ -55,7 +55,9 @@ public class IronGolemController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java index 611ebaf30..4601d509e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java @@ -61,7 +61,9 @@ public class MagmaCubeController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java index 3fb7df1d5..b22d38415 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java @@ -68,7 +68,9 @@ public class MushroomCowController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java index 3b6700d05..5ca9b7749 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java @@ -66,7 +66,9 @@ public class OcelotController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java index 13200907a..068becf9f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java @@ -67,7 +67,9 @@ public class PigController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java index eb60541b6..bc70d60b9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java @@ -56,7 +56,9 @@ public class PigZombieController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java index 75bc39dfe..10aa097c1 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java @@ -67,7 +67,9 @@ public class RabbitController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java index 16bd95820..4054a5fd2 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java @@ -66,7 +66,9 @@ public class SheepController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java index 680301bdc..7b735d276 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java @@ -55,7 +55,9 @@ public class SilverfishController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java index 471fd01df..7d32a43fa 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java @@ -55,7 +55,9 @@ public class SkeletonController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java index d77a11822..0808433c6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java @@ -61,7 +61,9 @@ public class SlimeController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java index 58c280d5b..1f1d05bd9 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java @@ -55,7 +55,9 @@ public class SnowmanController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java index 9b3971ffa..d40aa4a87 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java @@ -55,7 +55,9 @@ public class SpiderController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java index c67e73123..47c8fc0d7 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java @@ -55,7 +55,9 @@ public class SquidController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java index dedba24aa..cb30d321a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java @@ -70,7 +70,9 @@ public class VillagerController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java index 089f82c14..9c16d466c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java @@ -55,7 +55,9 @@ public class WitchController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java index dcae52f71..f9b9a8567 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java @@ -46,7 +46,9 @@ public class WitherController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java index ee1325786..964fb708a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java @@ -68,7 +68,9 @@ public class WolfController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java index aa61c099e..8f8a310b7 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java @@ -55,7 +55,9 @@ public class ZombieController extends MobEntityController { 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_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java index 061c52c70..6e5fbad41 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java @@ -131,7 +131,8 @@ public class PlayerNavigation extends NavigationAbstract { if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { Block localBlock = this.c.getType(new BlockPosition(k, paramInt2 - 1, m)).getBlock(); Material localMaterial = localBlock.getMaterial(); - if ((localMaterial == Material.AIR) || ((localMaterial == Material.WATER) && (!this.b.V())) || (localMaterial == Material.LAVA)) { + if ((localMaterial == Material.AIR) || ((localMaterial == Material.WATER) && (!this.b.V())) + || (localMaterial == Material.LAVA)) { return false; } }