From 40a60fbc8f016a0fc88a7b44a3a5a9d1c1fe687b Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 10 Mar 2024 11:52:38 +0800 Subject: [PATCH] Remove push override as Paper broke source compatibility --- .../main/java/net/citizensnpcs/EventListen.java | 3 +++ main/src/main/resources/de.json | 15 +++++++++++++-- .../nms/v1_20_R3/entity/AllayController.java | 9 --------- .../nms/v1_20_R3/entity/ArmorStandController.java | 11 +---------- .../nms/v1_20_R3/entity/AxolotlController.java | 9 --------- .../nms/v1_20_R3/entity/BatController.java | 9 --------- .../nms/v1_20_R3/entity/BeeController.java | 9 --------- .../nms/v1_20_R3/entity/BlazeController.java | 9 --------- .../nms/v1_20_R3/entity/CamelController.java | 9 --------- .../nms/v1_20_R3/entity/CatController.java | 9 --------- .../nms/v1_20_R3/entity/CaveSpiderController.java | 9 --------- .../nms/v1_20_R3/entity/ChickenController.java | 9 --------- .../nms/v1_20_R3/entity/CodController.java | 9 --------- .../nms/v1_20_R3/entity/CowController.java | 9 --------- .../nms/v1_20_R3/entity/CreeperController.java | 9 --------- .../nms/v1_20_R3/entity/DolphinController.java | 9 --------- .../nms/v1_20_R3/entity/DrownedController.java | 9 --------- .../v1_20_R3/entity/EnderDragonController.java | 9 --------- .../nms/v1_20_R3/entity/EndermanController.java | 9 --------- .../nms/v1_20_R3/entity/EndermiteController.java | 9 --------- .../nms/v1_20_R3/entity/EntityHumanNPC.java | 9 --------- .../nms/v1_20_R3/entity/EvokerController.java | 9 --------- .../nms/v1_20_R3/entity/FoxController.java | 9 --------- .../nms/v1_20_R3/entity/FrogController.java | 9 --------- .../nms/v1_20_R3/entity/GhastController.java | 9 --------- .../nms/v1_20_R3/entity/GiantController.java | 9 --------- .../nms/v1_20_R3/entity/GlowSquidController.java | 9 --------- .../nms/v1_20_R3/entity/GoatController.java | 9 --------- .../nms/v1_20_R3/entity/GuardianController.java | 9 --------- .../v1_20_R3/entity/GuardianElderController.java | 9 --------- .../nms/v1_20_R3/entity/HoglinController.java | 9 --------- .../nms/v1_20_R3/entity/HorseController.java | 9 --------- .../v1_20_R3/entity/HorseDonkeyController.java | 9 --------- .../nms/v1_20_R3/entity/HorseMuleController.java | 9 --------- .../v1_20_R3/entity/HorseSkeletonController.java | 9 --------- .../v1_20_R3/entity/HorseZombieController.java | 9 --------- .../nms/v1_20_R3/entity/IllusionerController.java | 9 --------- .../nms/v1_20_R3/entity/IronGolemController.java | 9 --------- .../nms/v1_20_R3/entity/LlamaController.java | 9 --------- .../nms/v1_20_R3/entity/MagmaCubeController.java | 9 --------- .../v1_20_R3/entity/MushroomCowController.java | 9 --------- .../nms/v1_20_R3/entity/OcelotController.java | 9 --------- .../nms/v1_20_R3/entity/PandaController.java | 9 --------- .../nms/v1_20_R3/entity/ParrotController.java | 9 --------- .../nms/v1_20_R3/entity/PhantomController.java | 9 --------- .../nms/v1_20_R3/entity/PigController.java | 9 --------- .../nms/v1_20_R3/entity/PigZombieController.java | 9 --------- .../v1_20_R3/entity/PiglinBruteController.java | 9 --------- .../nms/v1_20_R3/entity/PiglinController.java | 9 --------- .../nms/v1_20_R3/entity/PillagerController.java | 9 --------- .../nms/v1_20_R3/entity/PolarBearController.java | 9 --------- .../nms/v1_20_R3/entity/PufferFishController.java | 9 --------- .../nms/v1_20_R3/entity/RabbitController.java | 9 --------- .../nms/v1_20_R3/entity/RavagerController.java | 9 --------- .../nms/v1_20_R3/entity/SalmonController.java | 9 --------- .../nms/v1_20_R3/entity/SheepController.java | 9 --------- .../nms/v1_20_R3/entity/ShulkerController.java | 9 --------- .../nms/v1_20_R3/entity/SilverfishController.java | 9 --------- .../nms/v1_20_R3/entity/SkeletonController.java | 9 --------- .../v1_20_R3/entity/SkeletonStrayController.java | 9 --------- .../v1_20_R3/entity/SkeletonWitherController.java | 9 --------- .../nms/v1_20_R3/entity/SlimeController.java | 9 --------- .../nms/v1_20_R3/entity/SnifferController.java | 9 --------- .../nms/v1_20_R3/entity/SnowmanController.java | 9 --------- .../nms/v1_20_R3/entity/SpiderController.java | 9 --------- .../nms/v1_20_R3/entity/SquidController.java | 9 --------- .../nms/v1_20_R3/entity/StriderController.java | 9 --------- .../nms/v1_20_R3/entity/TadpoleController.java | 9 --------- .../v1_20_R3/entity/TraderLlamaController.java | 9 --------- .../v1_20_R3/entity/TropicalFishController.java | 9 --------- .../nms/v1_20_R3/entity/TurtleController.java | 9 --------- .../nms/v1_20_R3/entity/VexController.java | 9 --------- .../nms/v1_20_R3/entity/VillagerController.java | 9 --------- .../nms/v1_20_R3/entity/VindicatorController.java | 9 --------- .../entity/WanderingTraderController.java | 9 --------- .../nms/v1_20_R3/entity/WardenController.java | 9 --------- .../nms/v1_20_R3/entity/WitchController.java | 9 --------- .../nms/v1_20_R3/entity/WitherController.java | 9 --------- .../nms/v1_20_R3/entity/WolfController.java | 9 --------- .../nms/v1_20_R3/entity/ZoglinController.java | 9 --------- .../nms/v1_20_R3/entity/ZombieController.java | 9 --------- .../nms/v1_20_R3/entity/ZombieHuskController.java | 9 --------- .../v1_20_R3/entity/ZombieVillagerController.java | 9 --------- .../nonliving/AreaEffectCloudController.java | 9 --------- .../entity/nonliving/BlockDisplayController.java | 9 --------- .../v1_20_R3/entity/nonliving/BoatController.java | 9 --------- .../entity/nonliving/ChestBoatController.java | 9 --------- .../nonliving/DragonFireballController.java | 9 --------- .../v1_20_R3/entity/nonliving/EggController.java | 9 --------- .../entity/nonliving/EnderCrystalController.java | 9 --------- .../entity/nonliving/EnderPearlController.java | 9 --------- .../entity/nonliving/EnderSignalController.java | 9 --------- .../entity/nonliving/EvokerFangsController.java | 9 --------- .../entity/nonliving/ExperienceOrbController.java | 9 --------- .../entity/nonliving/FallingBlockController.java | 9 --------- .../entity/nonliving/FireworkController.java | 9 --------- .../entity/nonliving/FishingHookController.java | 9 --------- .../entity/nonliving/GlowItemFrameController.java | 9 --------- .../entity/nonliving/InteractionController.java | 9 --------- .../v1_20_R3/entity/nonliving/ItemController.java | 9 --------- .../entity/nonliving/ItemDisplayController.java | 9 --------- .../entity/nonliving/ItemFrameController.java | 9 --------- .../entity/nonliving/LargeFireballController.java | 9 --------- .../entity/nonliving/LeashController.java | 9 --------- .../entity/nonliving/LlamaSpitController.java | 9 --------- .../entity/nonliving/MarkerController.java | 9 --------- .../entity/nonliving/MinecartChestController.java | 9 --------- .../nonliving/MinecartCommandController.java | 9 --------- .../nonliving/MinecartFurnaceController.java | 9 --------- .../nonliving/MinecartHopperController.java | 9 --------- .../nonliving/MinecartRideableController.java | 9 --------- .../nonliving/MinecartSpawnerController.java | 9 --------- .../entity/nonliving/MinecartTNTController.java | 9 --------- .../entity/nonliving/PaintingController.java | 9 --------- .../entity/nonliving/ShulkerBulletController.java | 9 --------- .../entity/nonliving/SmallFireballController.java | 9 --------- .../entity/nonliving/SnowballController.java | 9 --------- .../entity/nonliving/SpectralArrowController.java | 9 --------- .../entity/nonliving/TNTPrimedController.java | 9 --------- .../entity/nonliving/TextDisplayController.java | 9 --------- .../nonliving/ThrownExpBottleController.java | 9 --------- .../entity/nonliving/ThrownPotionController.java | 9 --------- .../entity/nonliving/ThrownTridentController.java | 9 --------- .../entity/nonliving/TippedArrowController.java | 9 --------- .../entity/nonliving/WitherSkullController.java | 9 --------- 125 files changed, 17 insertions(+), 1110 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java index 42b68800d..caed3d8dd 100644 --- a/main/src/main/java/net/citizensnpcs/EventListen.java +++ b/main/src/main/java/net/citizensnpcs/EventListen.java @@ -874,6 +874,9 @@ public class EventListen implements Listener { Entity pushedBy = (Entity) getPushedBy.invoke(event); Vector vector = (Vector) getAcceleration.invoke(event); NPCPushEvent push = new NPCPushEvent(npc, vector, pushedBy); + if (pushedBy == null && !npc.data().get(NPC.Metadata.COLLIDABLE, !npc.isProtected())) { + push.setCancelled(true); + } Bukkit.getPluginManager().callEvent(push); ((Cancellable) event).setCancelled(push.isCancelled()); } catch (Throwable ex) { diff --git a/main/src/main/resources/de.json b/main/src/main/resources/de.json index 83ed06e8b..662704759 100644 --- a/main/src/main/resources/de.json +++ b/main/src/main/resources/de.json @@ -1,5 +1,7 @@ { "citizens.changed-implementation" : "Implementation von Citizens wurde geändert, Plugin wird deaktiviert.", + "citizens.commands.citizens.description" : "Zeigt grundlegende Plugin-Informationen", + "citizens.commands.citizens.save.description" : "NPCs speichern", "citizens.commands.citizens.save.help" : "Benutze -a um asynchron (zum Haupt-Thread) zu speichern.", "citizens.commands.console-error" : "Bitte melde diesen Fehler: [Siehe Konsole]", "citizens.commands.errors.missing-world" : "Welt nicht gefunden.", @@ -12,6 +14,7 @@ "citizens.commands.invalid-number" : "Das ist keine gültige ID.", "citizens.commands.npc.activationrange.set" : "Aktivierungsreichweite wurde auf [[{0}]] gesetzt.", "citizens.commands.npc.age.cannot-be-aged" : "Dem NPC-Typ {0} kann kein Alter zugewiesen werden.", + "citizens.commands.npc.age.description" : "Legt das Alter eines NPCs fest", "citizens.commands.npc.age.help" : "Kann nur auf NPCs angewendet werden, die Kinder bekommen können. Benutze [[-l]] um das Alter zu sperren (Achtung: Ein erneutes Einloggen könnte benötigt werden, um den Effekt zu sehen).", "citizens.commands.npc.age.invalid-age" : "Ungültiges Alter. Gültig sind: adult, baby und eine Nummer zwischen -24000 und 0", "citizens.commands.npc.age.locked" : "Alter gesperrt.", @@ -63,20 +66,25 @@ "citizens.commands.npc.controllable.removed" : "[[{0}]] kann nicht länger kontrolliert werden.", "citizens.commands.npc.controllable.set" : "[[{0}]] kann nun kontrolliert werden.", "citizens.commands.npc.copy.copied" : "[[{0}]] wurde kopiert.", + "citizens.commands.npc.copy.description" : "Kopiert einen NPC", + "citizens.commands.npc.create.description" : "Erstellt einen neuen NPC", "citizens.commands.npc.create.invalid-mobtype" : "{0} ist kein gültiger NPC-Typ. Es wird der Standard-Typ verwendet.", "citizens.commands.npc.create.npc-name-too-long" : "Namen von NPCs können nicht länger als 16 Zeichen sein. Der Name wurde gekürzt.", + "citizens.commands.npc.description" : "Zeigt grundlegende NPC-Informationen", "citizens.commands.npc.deselect" : "NPC abgewählt.", "citizens.commands.npc.despawn.despawned" : "Du hast [[{0}]] despawned.", "citizens.commands.npc.gravity.disabled" : "Gravitation [[deaktiviert]].", "citizens.commands.npc.gravity.enabled" : "Gravitation [[aktiviert]].", "citizens.commands.npc.hologram.invalid-text-id" : "Ungültige Zeile.", "citizens.commands.npc.hologram.line-height-set" : "Zeilenhöhe beträgt nun [[{0}]].", + "citizens.commands.npc.hurt.description" : "Verletzt den NPC", "citizens.commands.npc.lookclose.set" : "[[{0}]] wurd sich nun drehen, wenn Spieler in der Nähe sind.", "citizens.commands.npc.lookclose.stopped" : "[[{0}]] wird sich nicht mehr drehen, wenn Spieler in der Nähe sind.", "citizens.commands.npc.mount.failed" : "Kontrolle von [[{0}]] fehlgeschlagen.", "citizens.commands.npc.moveto.format" : "Format ist x:y:z(:Welt) oder x y z( Welt).", "citizens.commands.npc.moveto.teleported" : "[[{0}]] teleportiert zu {1}.", "citizens.commands.npc.owner.already-owner" : "{0} ist bereits der Besitzer von {1}.", + "citizens.commands.npc.owner.description" : "Legt den Besitzer eines NPCs fest", "citizens.commands.npc.owner.owner" : "[[{0}]]'s Besitzer ist [[{1}]].", "citizens.commands.npc.owner.set" : "[[{1}]] ist nun der Besitzer von {0}.", "citizens.commands.npc.owner.set-server" : "[[Der Server]] ist nun der Besitzer von {0}.", @@ -87,12 +95,16 @@ "citizens.commands.npc.pose.removed" : "Pose entfernt.", "citizens.commands.npc.powered.set" : "[[{0}]] empfängt nun Strom.", "citizens.commands.npc.powered.stopped" : "[[{0}]] wird nicht länger Strom empfangen.", + "citizens.commands.npc.profession.description" : "Legt den Beruf eines NPCs fest", "citizens.commands.npc.profession.invalid-profession" : "{0} ist kein gültiger Beruf.", "citizens.commands.npc.profession.set" : "[[{0}]] ist nun ein [[{1}]].", + "citizens.commands.npc.remove.npcs-removed" : "NPCs entfernt.", "citizens.commands.npc.remove.removed" : "Du hast [[{0}]] permanent entfernt.", "citizens.commands.npc.remove.removed-all" : "Du hast alle NPCs permanent gelöscht.", + "citizens.commands.npc.rename.description" : "Benennt einen NPC um", "citizens.commands.npc.rename.renamed" : "Du hast [[{0}]] in [[{1}]] umbenannt.", - "citizens.commands.npc.select.already-selected" : "Der NPC ist bereits ausgewählt.", + "citizens.commands.npc.rotate.description" : "NPC drehen", + "citizens.commands.npc.select.already-selected" : "Du hast diesen NPC bereits ausgewählt", "citizens.commands.npc.size.description" : "{0}'s Grüße ist [[{1}]].", "citizens.commands.npc.size.set" : "{0}'s Grüße zu [[{1}]] gesetzt.", "citizens.commands.npc.spawn.already-spawned" : "{0} exisitert bereits an einem anderen Ort. Benutze '/npc tphere' um den NPC zu deiner Position zu teleportieren.", @@ -119,7 +131,6 @@ "citizens.commands.traitc.not-configurable" : "Diese Eigenschaft nicht nicht konfigurierbar.", "citizens.commands.traitc.not-on-npc" : "Der NPC besitzt nicht diese Eigenschaft.", "citizens.commands.trait.failed-to-add" : "<7>Konnte {0} nicht hinzufügen.", - "citizens.commands.trait.failed-to-change" : "<7>Konnte {0} nicht ändern.", "citizens.commands.trait.failed-to-remove" : "<7>Konnte {0} nicht entfernen.", "citizens.commands.trait.removed" : "Erfolgreich {0} entfernt.", "citizens.commands.unknown-command" : "Befehl nicht erkannt. Meintest du vielleicht:", diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AllayController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AllayController.java index 7063cac70..f220a3209 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AllayController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AllayController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftAllay; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import com.google.common.collect.Lists; import com.mojang.datafixers.util.Pair; @@ -203,14 +202,6 @@ public class AllayController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ArmorStandController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ArmorStandController.java index f1cc7664d..439bbf987 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ArmorStandController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ArmorStandController.java @@ -5,14 +5,13 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftArmorStand; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_20_R3.util.MobAI; +import net.citizensnpcs.nms.v1_20_R3.util.MobAI.ForwardingMobAI; import net.citizensnpcs.nms.v1_20_R3.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_20_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_20_R3.util.MobAI.ForwardingMobAI; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -101,14 +100,6 @@ public class ArmorStandController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AxolotlController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AxolotlController.java index 91987d114..85de92f7d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AxolotlController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AxolotlController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftAxolotl; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import com.mojang.serialization.Dynamic; @@ -196,14 +195,6 @@ public class AxolotlController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BatController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BatController.java index f9dad679e..b117643a1 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BatController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BatController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftBat; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -153,14 +152,6 @@ public class BatController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(net.minecraft.world.entity.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BeeController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BeeController.java index 0e4950924..831578a95 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BeeController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BeeController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftBee; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -150,14 +149,6 @@ public class BeeController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BlazeController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BlazeController.java index 4f0d2d932..d8ccd6798 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BlazeController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BlazeController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftBlaze; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -145,14 +144,6 @@ public class BlazeController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CamelController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CamelController.java index 3556b68fd..9281b9059 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CamelController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CamelController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftCamel; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -226,14 +225,6 @@ public class CamelController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CatController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CatController.java index 0775000f4..16c7c6edc 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CatController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CatController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftCat; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -180,14 +179,6 @@ public class CatController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CaveSpiderController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CaveSpiderController.java index 24b1ab503..03e31e1fd 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CaveSpiderController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CaveSpiderController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftCaveSpider; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -170,14 +169,6 @@ public class CaveSpiderController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ChickenController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ChickenController.java index 7f177c113..1ca592c71 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ChickenController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ChickenController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftChicken; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -188,14 +187,6 @@ public class ChickenController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CodController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CodController.java index 686c2ac0f..c65d3c99e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CodController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CodController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftCod; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -216,14 +215,6 @@ public class CodController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CowController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CowController.java index b7416abf0..46c1aa6f4 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CowController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CowController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftCow; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -195,14 +194,6 @@ public class CowController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CreeperController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CreeperController.java index d9d87c5f2..ed1834ee4 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CreeperController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CreeperController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftCreeper; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -180,14 +179,6 @@ public class CreeperController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DolphinController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DolphinController.java index c4514148c..02900bca5 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DolphinController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DolphinController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftDolphin; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -176,14 +175,6 @@ public class DolphinController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DrownedController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DrownedController.java index afd73f7da..12c7a745e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DrownedController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DrownedController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftDrowned; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -170,14 +169,6 @@ public class DrownedController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EnderDragonController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EnderDragonController.java index 5916aad8a..598e86f1d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EnderDragonController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EnderDragonController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEnderDragon; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -221,14 +220,6 @@ public class EnderDragonController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermanController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermanController.java index f3991a1e5..11ba9c0d0 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermanController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermanController.java @@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEnderman; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -173,14 +172,6 @@ public class EndermanController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermiteController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermiteController.java index f583d9bd1..3c07b7597 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermiteController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermiteController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEndermite; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -170,14 +169,6 @@ public class EndermiteController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EntityHumanNPC.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EntityHumanNPC.java index 91cb958a2..93911eea1 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EntityHumanNPC.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EntityHumanNPC.java @@ -10,7 +10,6 @@ import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; -import org.bukkit.util.Vector; import com.mojang.authlib.GameProfile; @@ -306,14 +305,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EvokerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EvokerController.java index 8d6f93a38..06389e956 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EvokerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EvokerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEvoker; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class EvokerController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FoxController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FoxController.java index 3fc329852..48e159089 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FoxController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FoxController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftFox; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -174,14 +173,6 @@ public class FoxController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FrogController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FrogController.java index 4253d6bfa..6a400636f 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FrogController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FrogController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftFrog; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -177,14 +176,6 @@ public class FrogController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GhastController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GhastController.java index a337b3956..b181be40e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GhastController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GhastController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftGhast; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -145,14 +144,6 @@ public class GhastController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GiantController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GiantController.java index 3c7c7881e..cb36c506e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GiantController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GiantController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftGiant; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class GiantController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GlowSquidController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GlowSquidController.java index a2321eff3..fcd9b4111 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GlowSquidController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GlowSquidController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftGlowSquid; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class GlowSquidController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GoatController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GoatController.java index a1a988423..547c49077 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GoatController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GoatController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftGoat; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -174,14 +173,6 @@ public class GoatController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianController.java index b86067271..396f666ac 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftGuardian; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -170,14 +169,6 @@ public class GuardianController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianElderController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianElderController.java index 09673a530..f459b0581 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianElderController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianElderController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftElderGuardian; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -170,14 +169,6 @@ public class GuardianElderController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HoglinController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HoglinController.java index 9114b315b..ccef1b7a2 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HoglinController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HoglinController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHoglin; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -170,14 +169,6 @@ public class HoglinController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseController.java index 8980f8932..f9aa757a4 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHorse; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -220,14 +219,6 @@ public class HorseController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseDonkeyController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseDonkeyController.java index e6a475ebf..9d22b3cc5 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseDonkeyController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseDonkeyController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftDonkey; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -220,14 +219,6 @@ public class HorseDonkeyController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseMuleController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseMuleController.java index e89e17cf1..0d66e92c9 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseMuleController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseMuleController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMule; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -220,14 +219,6 @@ public class HorseMuleController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseSkeletonController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseSkeletonController.java index 691e2f726..e545106a8 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseSkeletonController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseSkeletonController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSkeletonHorse; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -219,14 +218,6 @@ public class HorseSkeletonController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseZombieController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseZombieController.java index c7322291f..ad402161c 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseZombieController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseZombieController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftZombieHorse; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -220,14 +219,6 @@ public class HorseZombieController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IllusionerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IllusionerController.java index 6d68092f7..2378d143f 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IllusionerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IllusionerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftIllusioner; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class IllusionerController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IronGolemController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IronGolemController.java index 137ee57fd..a229d646d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IronGolemController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IronGolemController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftIronGolem; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class IronGolemController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/LlamaController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/LlamaController.java index 30003a4fa..7b2a7f906 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/LlamaController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/LlamaController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftLlama; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -220,14 +219,6 @@ public class LlamaController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MagmaCubeController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MagmaCubeController.java index 3322ecaea..0d11e065f 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MagmaCubeController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MagmaCubeController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMagmaCube; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -172,14 +171,6 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MushroomCowController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MushroomCowController.java index df733fdaa..511bc4fa2 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MushroomCowController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MushroomCowController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMushroomCow; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -184,14 +183,6 @@ public class MushroomCowController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/OcelotController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/OcelotController.java index 15b3d1ace..2eb9b1d99 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/OcelotController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/OcelotController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftOcelot; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -180,14 +179,6 @@ public class OcelotController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PandaController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PandaController.java index 6d2c1b5c5..432f0e84a 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PandaController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PandaController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPanda; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -174,14 +173,6 @@ public class PandaController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ParrotController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ParrotController.java index fa5bb2a43..53ff1a557 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ParrotController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ParrotController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftParrot; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -155,14 +154,6 @@ public class ParrotController extends MobEntityController { return InteractionResult.FAIL; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PhantomController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PhantomController.java index b3881c60e..4b6b6b779 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PhantomController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PhantomController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPhantom; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -206,14 +205,6 @@ public class PhantomController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigController.java index eb868efed..430b6c156 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPig; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -181,14 +180,6 @@ public class PigController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigZombieController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigZombieController.java index 1e42ee20e..c08f296ee 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigZombieController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigZombieController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPigZombie; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class PigZombieController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinBruteController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinBruteController.java index 71e235fb4..936db62ba 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinBruteController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinBruteController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPiglinBrute; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -167,14 +166,6 @@ public class PiglinBruteController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinController.java index d0f3b24f2..ccd75bb74 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPiglin; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -182,14 +181,6 @@ public class PiglinController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PillagerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PillagerController.java index 3eca6fd85..29db069a2 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PillagerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PillagerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPillager; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -174,14 +173,6 @@ public class PillagerController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PolarBearController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PolarBearController.java index 8d4b18982..805d2f230 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PolarBearController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PolarBearController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPolarBear; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -150,14 +149,6 @@ public class PolarBearController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PufferFishController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PufferFishController.java index 56ac6a939..f844da571 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PufferFishController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PufferFishController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPufferFish; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -218,14 +217,6 @@ public class PufferFishController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java index d3116eeaf..98c07453b 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftRabbit; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -183,14 +182,6 @@ public class RabbitController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RavagerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RavagerController.java index 50db880c2..585c42afc 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RavagerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RavagerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftRavager; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -179,14 +178,6 @@ public class RavagerController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SalmonController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SalmonController.java index e5bfcfb09..f690d02ea 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SalmonController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SalmonController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSalmon; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -208,14 +207,6 @@ public class SalmonController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SheepController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SheepController.java index c38235dae..41b58d32e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SheepController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SheepController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSheep; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -174,14 +173,6 @@ public class SheepController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ShulkerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ShulkerController.java index 1fbbc7ca9..3a2da28f8 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ShulkerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ShulkerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftShulker; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -168,14 +167,6 @@ public class ShulkerController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SilverfishController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SilverfishController.java index e1af12ba4..c4c762121 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SilverfishController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SilverfishController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSilverfish; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SilverfishController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonController.java index 6bc5af828..d93a99f1d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSkeleton; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SkeletonController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonStrayController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonStrayController.java index 5cc2caaa0..4ed944668 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonStrayController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonStrayController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftStray; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SkeletonStrayController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonWitherController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonWitherController.java index 314bd8337..11f81f898 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonWitherController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonWitherController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWitherSkeleton; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SkeletonWitherController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SlimeController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SlimeController.java index a80af4372..db6c82755 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SlimeController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SlimeController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSlime; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -174,14 +173,6 @@ public class SlimeController extends MobEntityController { } } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnifferController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnifferController.java index 0039d4df6..d4ac759a1 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnifferController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnifferController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSniffer; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -189,14 +188,6 @@ public class SnifferController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnowmanController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnowmanController.java index 1d4df69d2..78bd96cf3 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnowmanController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnowmanController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSnowman; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SnowmanController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SpiderController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SpiderController.java index 716521ca1..949d29007 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SpiderController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SpiderController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSpider; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SpiderController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SquidController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SquidController.java index 4121207e9..737e43fac 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SquidController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SquidController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSquid; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class SquidController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/StriderController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/StriderController.java index b9353b7c1..51b774f28 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/StriderController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/StriderController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftStrider; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class StriderController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TadpoleController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TadpoleController.java index 54b718f29..c01a878ef 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TadpoleController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TadpoleController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTadpole; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -208,14 +207,6 @@ public class TadpoleController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TraderLlamaController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TraderLlamaController.java index c625e0ec0..4f0934415 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TraderLlamaController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TraderLlamaController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTraderLlama; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -192,14 +191,6 @@ public class TraderLlamaController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TropicalFishController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TropicalFishController.java index 6fa26d85b..96581d12e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TropicalFishController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TropicalFishController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTropicalFish; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -210,14 +209,6 @@ public class TropicalFishController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TurtleController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TurtleController.java index 5544df959..9a84cf11d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TurtleController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TurtleController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTurtle; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.EntityMoveControl; @@ -186,14 +185,6 @@ public class TurtleController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VexController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VexController.java index 7bdc9e992..93af98c02 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VexController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VexController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftVex; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -143,14 +142,6 @@ public class VexController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VillagerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VillagerController.java index 66eabb535..b6f3cad0a 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VillagerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VillagerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftVillager; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -211,14 +210,6 @@ public class VillagerController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VindicatorController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VindicatorController.java index 20cb0f58b..d4cf6bea3 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VindicatorController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VindicatorController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftVindicator; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -174,14 +173,6 @@ public class VindicatorController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WanderingTraderController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WanderingTraderController.java index feef96e70..8d3726a45 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WanderingTraderController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WanderingTraderController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWanderingTrader; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -211,14 +210,6 @@ public class WanderingTraderController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WardenController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WardenController.java index fcb01b1ab..c89a05b78 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WardenController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WardenController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWarden; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -171,14 +170,6 @@ public class WardenController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitchController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitchController.java index 693db8f16..701dfd54c 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitchController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitchController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWitch; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class WitchController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitherController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitherController.java index 0d1eaaa40..3d2dd8183 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitherController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitherController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWither; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -155,14 +154,6 @@ public class WitherController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WolfController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WolfController.java index f4f52d1f7..b4fd5990c 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WolfController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WolfController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWolf; import org.bukkit.event.entity.EntityTargetEvent; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -176,14 +175,6 @@ public class WolfController extends MobEntityController { NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZoglinController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZoglinController.java index 106dbdd66..dfade2117 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZoglinController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZoglinController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftZoglin; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -166,14 +165,6 @@ public class ZoglinController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieController.java index 6f3bb9a34..bf6a8d039 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftZombie; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class ZombieController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieHuskController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieHuskController.java index 593ba0f12..6e1bcb3e5 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieHuskController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieHuskController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHusk; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class ZombieHuskController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieVillagerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieVillagerController.java index f8e66b276..0cbbe5cfa 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieVillagerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieVillagerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftVillagerZombie; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -164,14 +163,6 @@ public class ZombieVillagerController extends MobEntityController { return false; } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/AreaEffectCloudController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/AreaEffectCloudController.java index 6a793a009..b1c468463 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/AreaEffectCloudController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/AreaEffectCloudController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftAreaEffectCloud; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -83,14 +82,6 @@ public class AreaEffectCloudController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BlockDisplayController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BlockDisplayController.java index 5def8945b..8c992ce67 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BlockDisplayController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BlockDisplayController.java @@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftBlockDisplay; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -96,14 +95,6 @@ public class BlockDisplayController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BoatController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BoatController.java index c7f81c2bc..d1b91c3bd 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BoatController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BoatController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftBoat; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -112,14 +111,6 @@ public class BoatController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ChestBoatController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ChestBoatController.java index f89503731..5e3678adc 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ChestBoatController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ChestBoatController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftChestBoat; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -113,14 +112,6 @@ public class ChestBoatController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/DragonFireballController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/DragonFireballController.java index e2b6255ae..982263d0f 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/DragonFireballController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/DragonFireballController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftDragonFireball; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -83,14 +82,6 @@ public class DragonFireballController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EggController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EggController.java index 2f0c82a59..edcce2c52 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EggController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EggController.java @@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEgg; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -97,14 +96,6 @@ public class EggController extends AbstractEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderCrystalController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderCrystalController.java index e4f424dfc..9e9b46fe3 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderCrystalController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderCrystalController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEnderCrystal; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -83,14 +82,6 @@ public class EnderCrystalController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderPearlController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderPearlController.java index 60f512e06..d7d354777 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderPearlController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderPearlController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEnderPearl; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.EnderPearl; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -84,14 +83,6 @@ public class EnderPearlController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderSignalController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderSignalController.java index 6fe68bed1..e64787387 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderSignalController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderSignalController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEnderSignal; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.EnderSignal; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -84,14 +83,6 @@ public class EnderSignalController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EvokerFangsController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EvokerFangsController.java index 65db24f50..9bae43cd2 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EvokerFangsController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EvokerFangsController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEvokerFangs; import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -91,14 +90,6 @@ public class EvokerFangsController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ExperienceOrbController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ExperienceOrbController.java index 03997983c..4d4028312 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ExperienceOrbController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ExperienceOrbController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftExperienceOrb; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class ExperienceOrbController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FallingBlockController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FallingBlockController.java index caafa7600..1fa8a72e8 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FallingBlockController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FallingBlockController.java @@ -8,7 +8,6 @@ import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftFallingBlock; import org.bukkit.craftbukkit.v1_20_R3.util.CraftMagicNumbers; import org.bukkit.entity.FallingBlock; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.NMSBoundingBox; @@ -93,14 +92,6 @@ public class FallingBlockController extends AbstractEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FireworkController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FireworkController.java index 3809cbb9e..19469494a 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FireworkController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FireworkController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftFirework; import org.bukkit.entity.Firework; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class FireworkController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FishingHookController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FishingHookController.java index 03f07d092..c1b50a79b 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FishingHookController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FishingHookController.java @@ -9,7 +9,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftFishHook; import org.bukkit.entity.FishHook; -import org.bukkit.util.Vector; import com.mojang.authlib.GameProfile; @@ -110,14 +109,6 @@ public class FishingHookController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/GlowItemFrameController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/GlowItemFrameController.java index 60559373d..01b621837 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/GlowItemFrameController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/GlowItemFrameController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftGlowItemFrame; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -88,14 +87,6 @@ public class GlowItemFrameController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/InteractionController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/InteractionController.java index 29bda14bd..37b6fc23d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/InteractionController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/InteractionController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftInteraction; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class InteractionController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemController.java index 4b2b422e2..99a771836 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemController.java @@ -8,7 +8,6 @@ import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftItem; import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Item; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.NMSBoundingBox; @@ -97,14 +96,6 @@ public class ItemController extends AbstractEntityController { } } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemDisplayController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemDisplayController.java index 3609a0c63..948edfff7 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemDisplayController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemDisplayController.java @@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftItemDisplay; import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -90,14 +89,6 @@ public class ItemDisplayController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemFrameController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemFrameController.java index e7906f82b..90b56d377 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemFrameController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemFrameController.java @@ -5,7 +5,6 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftItemFrame; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -88,14 +87,6 @@ public class ItemFrameController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LargeFireballController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LargeFireballController.java index 9a3668536..ceba3d05e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LargeFireballController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LargeFireballController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftLargeFireball; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class LargeFireballController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LeashController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LeashController.java index 30223e48c..71c1b030f 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LeashController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LeashController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftLeash; import org.bukkit.entity.LeashHitch; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class LeashController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LlamaSpitController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LlamaSpitController.java index 3b5113a95..c75bc4515 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LlamaSpitController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/LlamaSpitController.java @@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftLlamaSpit; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.util.ForwardingNPCHolder; @@ -94,14 +93,6 @@ public class LlamaSpitController extends AbstractEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MarkerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MarkerController.java index 24da7aec1..7ee195fe0 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MarkerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MarkerController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMarker; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class MarkerController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartChestController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartChestController.java index 0477973ca..3a997075e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartChestController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartChestController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMinecartChest; import org.bukkit.entity.Minecart; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class MinecartChestController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartCommandController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartCommandController.java index 1fdd4460e..eec912933 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartCommandController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartCommandController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMinecartCommand; import org.bukkit.entity.Minecart; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class MinecartCommandController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartFurnaceController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartFurnaceController.java index c1dce27a7..869b20571 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartFurnaceController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartFurnaceController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMinecartFurnace; import org.bukkit.entity.Minecart; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class MinecartFurnaceController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartHopperController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartHopperController.java index 7af13c510..41b128d14 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartHopperController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartHopperController.java @@ -1,7 +1,6 @@ package net.citizensnpcs.nms.v1_20_R3.entity.nonliving; import org.bukkit.entity.Minecart; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -65,14 +64,6 @@ public class MinecartHopperController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartRideableController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartRideableController.java index b180d6616..7595ae777 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartRideableController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartRideableController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMinecartRideable; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class MinecartRideableController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartSpawnerController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartSpawnerController.java index 1b5a01e77..ba9b9a34e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartSpawnerController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartSpawnerController.java @@ -1,7 +1,6 @@ package net.citizensnpcs.nms.v1_20_R3.entity.nonliving; import org.bukkit.entity.Minecart; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -65,14 +64,6 @@ public class MinecartSpawnerController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartTNTController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartTNTController.java index d0f93f3ec..1f6f796c4 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartTNTController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/MinecartTNTController.java @@ -1,7 +1,6 @@ package net.citizensnpcs.nms.v1_20_R3.entity.nonliving; import org.bukkit.entity.Minecart; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -65,14 +64,6 @@ public class MinecartTNTController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/PaintingController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/PaintingController.java index 1d6056724..739a2ca88 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/PaintingController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/PaintingController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPainting; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class PaintingController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ShulkerBulletController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ShulkerBulletController.java index ac9d08a88..878235c72 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ShulkerBulletController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ShulkerBulletController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftShulkerBullet; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class ShulkerBulletController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SmallFireballController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SmallFireballController.java index 1ee598598..7330b72fc 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SmallFireballController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SmallFireballController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSmallFireball; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class SmallFireballController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SnowballController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SnowballController.java index 98441ced5..3fba8d21d 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SnowballController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SnowballController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftSnowball; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class SnowballController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SpectralArrowController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SpectralArrowController.java index 4f33ace4d..9ab6c26ca 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SpectralArrowController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/SpectralArrowController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftArrow; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Arrow; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class SpectralArrowController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TNTPrimedController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TNTPrimedController.java index 9818ee4f5..91b510d5e 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TNTPrimedController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TNTPrimedController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTNTPrimed; import org.bukkit.entity.TNTPrimed; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class TNTPrimedController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TextDisplayController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TextDisplayController.java index e74aecea0..fe4de1313 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TextDisplayController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TextDisplayController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTextDisplay; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class TextDisplayController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownExpBottleController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownExpBottleController.java index cc348baa5..3fbb12380 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownExpBottleController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftThrownExpBottle; import org.bukkit.entity.ThrownExpBottle; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class ThrownExpBottleController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownPotionController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownPotionController.java index c7c46dd3c..7c676074c 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownPotionController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownPotionController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftThrownPotion; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -82,14 +81,6 @@ public class ThrownPotionController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownTridentController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownTridentController.java index af5f0eaa4..ea95144b9 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownTridentController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ThrownTridentController.java @@ -5,7 +5,6 @@ import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTrident; import org.bukkit.entity.Trident; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -78,14 +77,6 @@ public class ThrownTridentController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TippedArrowController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TippedArrowController.java index 0c99c0009..53e0069b2 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TippedArrowController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/TippedArrowController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftTippedArrow; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class TippedArrowController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/WitherSkullController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/WitherSkullController.java index 3de827736..6df8b6c15 100644 --- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/WitherSkullController.java +++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/WitherSkullController.java @@ -4,7 +4,6 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_20_R3.CraftServer; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWitherSkull; -import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_20_R3.entity.MobEntityController; @@ -77,14 +76,6 @@ public class WitherSkullController extends MobEntityController { return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); } - @Override - public void push(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.push(vector.getX(), vector.getY(), vector.getZ()); - } - } - @Override public void push(Entity entity) { // this method is called by both the entities involved - cancelling