Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove push override as Paper broke source compatibility

This commit is contained in:
fullwall 2024-03-10 11:52:38 +08:00
parent 6642923b49
commit 40a60fbc8f
125 changed files with 17 additions and 1110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/EventListen.java
View File

@ -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) {

15
main/src/main/resources/de.json
View File

@ -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:",

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AllayController.java
View File

@ -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

11
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ArmorStandController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/AxolotlController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BatController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BeeController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/BlazeController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CamelController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CatController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CaveSpiderController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ChickenController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CodController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CowController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/CreeperController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DolphinController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/DrownedController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EnderDragonController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermanController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EndermiteController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EntityHumanNPC.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/EvokerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FoxController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/FrogController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GhastController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GiantController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GlowSquidController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GoatController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/GuardianElderController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HoglinController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseDonkeyController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseMuleController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseSkeletonController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/HorseZombieController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IllusionerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/IronGolemController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/LlamaController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MagmaCubeController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/MushroomCowController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/OcelotController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PandaController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ParrotController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PhantomController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PigZombieController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinBruteController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PiglinController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PillagerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PolarBearController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/PufferFishController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RavagerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SalmonController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SheepController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ShulkerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SilverfishController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonStrayController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SkeletonWitherController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SlimeController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnifferController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SnowmanController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SpiderController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/SquidController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/StriderController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TadpoleController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TraderLlamaController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TropicalFishController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/TurtleController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VexController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VillagerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/VindicatorController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WanderingTraderController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WardenController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitchController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WitherController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/WolfController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZoglinController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieHuskController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ZombieVillagerController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/AreaEffectCloudController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BlockDisplayController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/BoatController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ChestBoatController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/DragonFireballController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EggController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderCrystalController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderPearlController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EnderSignalController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/EvokerFangsController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ExperienceOrbController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FallingBlockController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FireworkController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/FishingHookController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/GlowItemFrameController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/InteractionController.java
View File

@ -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

9
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/nonliving/ItemController.java
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More