Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 02:55:45 +01:00
Code Issues Projects Releases Wiki Activity

Implement cross-world teleporting for NPCs

Browse Source
This commit is contained in:
fullwall 2022-01-16 14:05:23 +08:00
parent c702e19828
commit 1ee92a07ea
117 changed files with 973 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ public class EventListen implements Listener {
@EventHandler
public void onEntityPortal(EntityPortalEvent event) {
NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getEntity());
if (npc == null || event.getEntityType() != EntityType.PLAYER)
if (npc == null || npc.getEntity().getType() != EntityType.PLAYER)
return;
event.setCancelled(true);
npc.despawn(DespawnReason.PENDING_RESPAWN);

6
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -329,13 +329,13 @@ public class NPCCommands {
aliases = { "npc" },
usage = "collidable",
desc = "Toggles an NPC's collidability",
modifiers = { "collidable" },
modifiers = { "collidable", "pushable" },
min = 1,
max = 1,
permission = "citizens.npc.collidable")
@Requirements(ownership = true, selected = true, types = { EntityType.PLAYER })
@Requirements(ownership = true, selected = true)
public void collidable(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
npc.data().setPersistent(NPC.COLLIDABLE_METADATA, !npc.data().get(NPC.COLLIDABLE_METADATA, true));
npc.data().setPersistent(NPC.COLLIDABLE_METADATA, !npc.data().get(NPC.COLLIDABLE_METADATA, false));
Messaging.sendTr(sender,
npc.data().<Boolean> get(NPC.COLLIDABLE_METADATA) ? Messages.COLLIDABLE_SET : Messages.COLLIDABLE_UNSET,
npc.getName());

7
main/src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -197,11 +197,18 @@ public class NMS {
}
public static MethodHandle getFirstMethodHandle(Class<?> clazz, boolean log, Class<?>... params) {
return getFirstMethodHandleWithReturnType(clazz, log, null, params);
}
public static MethodHandle getFirstMethodHandleWithReturnType(Class<?> clazz, boolean log, Class<?> returnType,
Class<?>... params) {
if (clazz == null)
return null;
try {
Method first = null;
for (Method method : clazz.getDeclaredMethods()) {
if (returnType != null && !returnType.equals(method.getReturnType()))
continue;
Class<?>[] paramTypes = method.getParameterTypes();
if (paramTypes.length == params.length) {
first = method;

2
main/src/main/java/net/citizensnpcs/util/Util.java
View File

@ -52,7 +52,7 @@ public class Util {
return new Vector(x, y, z);
}
boolean allowed = !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)
|| !npc.data().get(NPC.COLLIDABLE_METADATA, true);
|| (npc.data().has(NPC.COLLIDABLE_METADATA) && npc.data().get(NPC.COLLIDABLE_METADATA, true));
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
return allowed ? new Vector(x, y, z) : null;
}

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/AxolotlController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -210,6 +211,13 @@ public class AxolotlController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -164,5 +166,12 @@ public class BatController extends MobEntityController {
public void setFlying(boolean flying) {
setResting(flying);
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
}

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -160,5 +162,12 @@ public class BeeController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
}

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -153,5 +155,12 @@ public class BlazeController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
}

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/CatController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -195,6 +196,13 @@ public class CatController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/CaveSpiderController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -193,6 +194,13 @@ public class CaveSpiderController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/ChickenController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -204,6 +205,13 @@ public class ChickenController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/CodController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -225,6 +226,13 @@ public class CodController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/CowController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -211,6 +212,13 @@ public class CowController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

7
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/CreeperController.java
View File

@ -197,6 +197,13 @@ public class CreeperController extends MobEntityController {
this.allowPowered = allowPowered;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void thunderHit(ServerLevel worldserver, LightningBolt entitylightning) {
if (npc == null || allowPowered) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/DolphinController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -194,6 +195,13 @@ public class DolphinController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/DrownedController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -181,6 +182,13 @@ public class DrownedController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -173,5 +175,12 @@ public class EnderDragonController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
}

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/EndermanController.java
View File

@ -18,6 +18,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -206,6 +207,13 @@ public class EndermanController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/EndermiteController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class EndermiteController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/EvokerController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -176,6 +177,13 @@ public class EvokerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/FoxController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class FoxController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -156,6 +158,13 @@ public class GhastController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
public static class GhastNPC extends CraftGhast implements ForwardingNPCHolder {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/GiantController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class GiantController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/GlowSquidController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class GlowSquidController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/GoatController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class GoatController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/GuardianController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -191,6 +192,13 @@ public class GuardianController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/GuardianElderController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -191,6 +192,13 @@ public class GuardianElderController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/HoglinController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -178,6 +179,13 @@ public class HoglinController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/HorseController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -235,6 +236,13 @@ public class HorseController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/HorseDonkeyController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -234,6 +235,13 @@ public class HorseDonkeyController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/HorseMuleController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -234,6 +235,13 @@ public class HorseMuleController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/HorseSkeletonController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -234,6 +235,13 @@ public class HorseSkeletonController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/HorseZombieController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -234,6 +235,13 @@ public class HorseZombieController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/IllusionerController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -176,6 +177,13 @@ public class IllusionerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/IronGolemController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class IronGolemController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/LlamaController.java
View File

@ -19,6 +19,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -206,6 +207,13 @@ public class LlamaController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/MagmaCubeController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class MagmaCubeController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/MushroomCowController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -199,6 +200,13 @@ public class MushroomCowController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/OcelotController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -196,6 +197,13 @@ public class OcelotController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PandaController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class PandaController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -167,6 +169,13 @@ public class ParrotController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
public static class ParrotNPC extends CraftParrot implements ForwardingNPCHolder {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PhantomController.java
View File

@ -17,6 +17,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.Difficulty;
import net.minecraft.world.damagesource.DamageSource;
@ -222,6 +223,13 @@ public class PhantomController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
// avoid suicide

7
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PigController.java
View File

@ -198,6 +198,13 @@ public class PigController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void thunderHit(ServerLevel worldserver, LightningBolt entitylightning) {
if (npc == null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PigZombieController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -176,6 +177,13 @@ public class PigZombieController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

11
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PiglinBruteController.java
View File

@ -1,7 +1,5 @@
package net.citizensnpcs.nms.v1_18_R1.entity;
import java.util.TreeMap;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity;
@ -17,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -39,7 +38,6 @@ public class PiglinBruteController extends MobEntityController {
}
public static class EntityPiglinBruteNPC extends PiglinBrute implements NPCHolder {
private TreeMap<?, ?> behaviorMap;
private final CitizensNPC npc;
public EntityPiglinBruteNPC(EntityType<? extends PiglinBrute> types, Level level) {
@ -181,6 +179,13 @@ public class PiglinBruteController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PiglinController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -178,6 +179,13 @@ public class PiglinController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PillagerController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class PillagerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,8 +13,10 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -163,6 +165,13 @@ public class PolarBearController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
public static class PolarBearNPC extends CraftPolarBear implements ForwardingNPCHolder {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/PufferFishController.java
View File

@ -17,6 +17,7 @@ import net.citizensnpcs.trait.versioned.PufferFishTrait;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -234,6 +235,13 @@ public class PufferFishController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -17,6 +17,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -41,7 +42,6 @@ public class RabbitController extends MobEntityController {
public static class EntityRabbitNPC extends Rabbit implements NPCHolder {
boolean calledNMSHeight = false;
private final CitizensNPC npc;
public EntityRabbitNPC(EntityType<? extends Rabbit> types, Level level) {
@ -212,6 +212,13 @@ public class RabbitController extends MobEntityController {
super.setRabbitType(i);
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/RavagerController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -189,6 +190,13 @@ public class RavagerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SalmonController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -217,6 +218,13 @@ public class SalmonController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -39,7 +40,6 @@ public class SheepController extends MobEntityController {
public static class EntitySheepNPC extends Sheep implements NPCHolder {
boolean calledNMSHeight = false;
private final CitizensNPC npc;
public EntitySheepNPC(EntityType<? extends Sheep> types, Level level) {
@ -190,6 +190,13 @@ public class SheepController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/ShulkerController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -188,6 +189,13 @@ public class ShulkerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SilverfishController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -182,6 +183,13 @@ public class SilverfishController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SkeletonController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class SkeletonController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SkeletonStrayController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class SkeletonStrayController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SkeletonWitherController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class SkeletonWitherController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SlimeController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -190,6 +191,13 @@ public class SlimeController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SnowmanController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -197,6 +198,13 @@ public class SnowmanController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SpiderController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class SpiderController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/SquidController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class SquidController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/StriderController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -175,6 +176,13 @@ public class StriderController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/TraderLlamaController.java
View File

@ -19,6 +19,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -207,6 +208,13 @@ public class TraderLlamaController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/TropicalFishController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -219,6 +220,13 @@ public class TropicalFishController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/TurtleController.java
View File

@ -16,6 +16,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -204,6 +205,13 @@ public class TurtleController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -150,6 +152,13 @@ public class VexController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
public static class VexNPC extends CraftVex implements ForwardingNPCHolder {

7
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/VillagerController.java
View File

@ -222,6 +222,13 @@ public class VillagerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void thunderHit(ServerLevel worldserver, LightningBolt entitylightning) {
if (npc == null) {

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

@ -16,6 +16,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -39,7 +40,6 @@ public class VindicatorController extends MobEntityController {
public static class EntityVindicatorNPC extends Vindicator implements NPCHolder {
boolean calledNMSHeight = false;
private final CitizensNPC npc;
public EntityVindicatorNPC(EntityType<? extends Vindicator> types, Level level) {
@ -191,6 +191,13 @@ public class VindicatorController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

7
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/WanderingTraderController.java
View File

@ -229,6 +229,13 @@ public class WanderingTraderController extends MobEntityController {
this.blockTrades = blocked;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void thunderHit(ServerLevel worldserver, LightningBolt entitylightning) {
if (npc == null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/WitchController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -184,6 +185,13 @@ public class WitchController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -156,6 +158,13 @@ public class WitherController extends MobEntityController {
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
}
public static class WitherNPC extends CraftWither implements ForwardingNPCHolder {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/WolfController.java
View File

@ -17,6 +17,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -197,6 +198,13 @@ public class WolfController extends MobEntityController {
return npc == null || this.equals(entityliving) ? super.setTarget(entityliving, reason, fire) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/ZoglinController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -177,6 +178,13 @@ public class ZoglinController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/ZombieController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -175,6 +176,13 @@ public class ZombieController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/ZombieHuskController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -175,6 +176,13 @@ public class ZombieHuskController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/ZombieVillagerController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@ -175,6 +176,13 @@ public class ZombieVillagerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.AreaEffectCloud;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
@ -83,6 +85,13 @@ public class AreaEffectCloudController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/ArmorStandController.java
View File

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity;
@ -99,6 +101,13 @@ public class ArmorStandController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/BoatController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.tags.FluidTags;
import net.minecraft.util.Mth;
@ -150,6 +151,13 @@ public class BoatController extends MobEntityController {
return m;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.projectile.DragonFireball;
@ -92,6 +94,13 @@ public class DragonFireballController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/EggController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
@ -98,6 +99,13 @@ public class EggController extends AbstractEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.boss.enderdragon.EndCrystal;
@ -83,6 +85,13 @@ public class EnderCrystalController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.projectile.ThrownEnderpearl;
@ -84,6 +86,13 @@ public class EnderPearlController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.projectile.EyeOfEnder;
@ -84,6 +86,13 @@ public class EnderSignalController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity;
@ -93,6 +95,13 @@ public class EvokerFangsController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

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

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.ExperienceOrb;
@ -77,6 +79,13 @@ public class ExperienceOrbController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/FallingBlockController.java
View File

@ -19,6 +19,7 @@ import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
@ -118,6 +119,13 @@ public class FallingBlockController extends AbstractEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

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

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.projectile.FireworkRocketEntity;
@ -78,6 +80,13 @@ public class FireworkController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/FishingHookController.java
View File

@ -18,6 +18,7 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
@ -97,6 +98,13 @@ public class FishingHookController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/GlowItemFrameController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.decoration.GlowItemFrame;
@ -97,6 +98,13 @@ public class GlowItemFrameController extends MobEntityController {
return npc == null || !npc.isProtected() ? super.survives() : true;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/ItemController.java
View File

@ -20,6 +20,7 @@ import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
@ -113,6 +114,13 @@ public class ItemController extends AbstractEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/ItemFrameController.java
View File

@ -19,6 +19,7 @@ import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.decoration.ItemFrame;
@ -96,6 +97,13 @@ public class ItemFrameController extends MobEntityController {
return npc == null || !npc.isProtected() ? super.survives() : true;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/LargeFireballController.java
View File

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.projectile.LargeFireball;
@ -86,6 +88,13 @@ public class LargeFireballController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/LeashController.java
View File

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.decoration.LeashFenceKnotEntity;
@ -83,6 +85,13 @@ public class LeashController extends MobEntityController {
return npc == null || !npc.isProtected() ? super.survives() : true;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

8
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/LlamaSpitController.java
View File

@ -15,6 +15,7 @@ import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
@ -95,6 +96,13 @@ public class LlamaSpitController extends AbstractEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/MarkerController.java
View File

@ -13,7 +13,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.Marker;
@ -77,6 +79,13 @@ public class MarkerController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
if (npc != null) {

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/MinecartChestController.java
View File

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.vehicle.MinecartChest;
@ -78,6 +80,13 @@ public class MinecartChestController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/MinecartCommandController.java
View File

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.vehicle.MinecartCommandBlock;
@ -78,6 +80,13 @@ public class MinecartCommandController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

9
v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/entity/nonliving/MinecartFurnaceController.java
View File

@ -14,7 +14,9 @@ import net.citizensnpcs.nms.v1_18_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.vehicle.MinecartFurnace;
@ -78,6 +80,13 @@ public class MinecartFurnaceController extends MobEntityController {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
if (npc == null)
return super.teleportTo(worldserver, location);
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
}
@Override
public void tick() {
super.tick();

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