Implement isPushableByFluid metadata up to 1.13.2
This commit is contained in:
fullwall
parent
adc4e0cbb0
commit
da19c909fe
|
|
@ -18,8 +18,10 @@ import net.minecraft.server.v1_13_R2.Entity;
|
|||
import net.minecraft.server.v1_13_R2.EntityBat;
|
||||
import net.minecraft.server.v1_13_R2.EntityBoat;
|
||||
import net.minecraft.server.v1_13_R2.EntityMinecartAbstract;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
import net.minecraft.server.v1_13_R2.NBTTagCompound;
|
||||
import net.minecraft.server.v1_13_R2.SoundEffect;
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.World;
|
||||
|
||||
public class BatController extends MobEntityController {
|
||||
|
|
@ -61,6 +63,20 @@ public class BatController extends MobEntityController {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX;
|
||||
double my = motY;
|
||||
double mz = motZ;
|
||||
boolean res = super.b(tag);
|
||||
if (!npc.isPushableByFluids()) {
|
||||
motX = mx;
|
||||
motY = my;
|
||||
motZ = mz;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
|
||||
// this method is called by both the entities involved - cancelling
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftBlaze;
|
||||
|
|
@ -47,6 +50,11 @@ public class BlazeController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityBlazeNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCaveSpider;
|
||||
|
|
@ -49,6 +52,11 @@ public class CaveSpiderController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityCaveSpiderNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -52,6 +55,11 @@ public class ChickenController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityChickenNPC extends EntityChicken implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityChickenNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCod;
|
||||
|
|
@ -54,6 +57,11 @@ public class CodController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityCodNPC extends EntityCod implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityCodNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCow;
|
||||
|
|
@ -53,6 +56,11 @@ public class CowController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityCowNPC extends EntityCow implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityCowNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCreeper;
|
||||
|
|
@ -50,6 +53,11 @@ public class CreeperController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private boolean allowPowered;
|
||||
private final CitizensNPC npc;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDolphin;
|
||||
|
|
@ -50,6 +53,11 @@ public class DolphinController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityDolphinNPC extends EntityDolphin implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityDolphinNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDrowned;
|
||||
|
|
@ -49,6 +52,11 @@ public class DrownedController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityDrownedNPC extends EntityDrowned implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityDrownedNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -50,6 +53,11 @@ public class EnderDragonController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEnderDragonNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderman;
|
||||
|
|
@ -49,6 +52,11 @@ public class EndermanController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEndermanNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEndermite;
|
||||
|
|
@ -49,6 +52,11 @@ public class EndermiteController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEndermiteNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.net.Socket;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class EvokerController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEvokerNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -33,6 +36,11 @@ public class GhastController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityGhastNPC extends EntityGhast implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityGhastNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class GiantController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityGiantNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -38,6 +41,11 @@ public class GuardianController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityGuardianNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -38,6 +41,11 @@ public class GuardianElderController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityGuardianElderNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -46,6 +49,11 @@ public class HorseController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityHorseNPC extends EntityHorse implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private double baseMovementSpeed;
|
||||
private final CitizensNPC npc;
|
||||
private boolean riding;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -46,6 +49,11 @@ public class HorseDonkeyController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private double baseMovementSpeed;
|
||||
private final CitizensNPC npc;
|
||||
private boolean riding;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -46,6 +49,11 @@ public class HorseMuleController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private double baseMovementSpeed;
|
||||
private final CitizensNPC npc;
|
||||
private boolean riding;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -46,6 +49,11 @@ public class HorseSkeletonController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private double baseMovementSpeed;
|
||||
private final CitizensNPC npc;
|
||||
private boolean riding;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -46,6 +49,11 @@ public class HorseZombieController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private double baseMovementSpeed;
|
||||
private final CitizensNPC npc;
|
||||
private boolean riding;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class IllusionerController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityIllusionerNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class IronGolemController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityIronGolemNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -44,6 +47,11 @@ public class LlamaController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityLlamaNPC extends EntityLlama implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityLlamaNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -37,6 +40,11 @@ public class MagmaCubeController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMagmaCubeNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.Map;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -38,6 +41,11 @@ public class MushroomCowController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMushroomCowNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class OcelotController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityOcelotNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class ParrotController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityParrotNPC extends EntityParrot implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityParrotNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -41,6 +44,11 @@ public class PhantomController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityPhantomNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -36,6 +39,11 @@ public class PigController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityPigNPC extends EntityPig implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityPigNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -36,6 +39,11 @@ public class PigZombieController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityPigZombieNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -33,6 +36,11 @@ public class PolarBearController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityPolarBearNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -41,6 +44,11 @@ public class PufferFishController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityPufferFishNPC extends EntityPufferFish implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityPufferFishNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -37,6 +40,11 @@ public class RabbitController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityRabbitNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -40,6 +43,11 @@ public class SalmonController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySalmonNPC extends EntitySalmon implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySalmonNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SheepController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySheepNPC extends EntitySheep implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySheepNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -39,6 +42,11 @@ public class ShulkerController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityShulkerNPC extends EntityShulker implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityShulkerNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SilverfishController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySilverfishNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SkeletonController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySkeletonNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SkeletonStrayController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityStrayNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SkeletonWitherController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySkeletonWitherNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -37,6 +40,11 @@ public class SlimeController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySlimeNPC extends EntitySlime implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySlimeNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -38,6 +41,11 @@ public class SnowmanController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySnowmanNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SpiderController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySpiderNPC extends EntitySpider implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySpiderNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class SquidController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySquidNPC extends EntitySquid implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySquidNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -40,6 +43,11 @@ public class TropicalFishController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityTropicalFishNPC extends EntityTropicalFish implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityTropicalFishNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -38,6 +41,11 @@ public class TurtleController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityTurtleNPC extends EntityTurtle implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityTurtleNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -33,6 +36,11 @@ public class VexController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityVexNPC extends EntityVex implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityVexNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -41,6 +44,11 @@ public class VillagerController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityVillagerNPC extends EntityVillager implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private boolean blockingATrade;
|
||||
private final CitizensNPC npc;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class VindicatorController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityVindicatorNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class WitchController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityWitchNPC extends EntityWitch implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityWitchNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -33,6 +36,11 @@ public class WitherController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityWitherNPC extends EntityWither implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityWitherNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -37,6 +40,11 @@ public class WolfController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityWolfNPC extends EntityWolf implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityWolfNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class ZombieController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityZombieNPC extends EntityZombie implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityZombieNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class ZombieHuskController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityZombieHuskNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -35,6 +38,11 @@ public class ZombieVillagerController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityZombieVillagerNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftAreaEffectCloud;
|
||||
|
|
@ -41,6 +44,11 @@ public class AreaEffectCloudController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityAreaEffectCloudNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftArmorStand;
|
||||
|
|
@ -47,6 +50,11 @@ public class ArmorStandController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityArmorStandNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftBoat;
|
||||
|
|
@ -42,6 +45,11 @@ public class BoatController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityBoatNPC extends EntityBoat implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityBoatNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDragonFireball;
|
||||
|
|
@ -42,6 +45,11 @@ public class DragonFireballController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityDragonFireballNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -52,6 +55,11 @@ public class EggController extends AbstractEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEggNPC extends EntityEgg implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEggNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderCrystal;
|
||||
|
|
@ -41,6 +44,11 @@ public class EnderCrystalController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEnderCrystalNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderPearl;
|
||||
|
|
@ -41,6 +44,11 @@ public class EnderPearlController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEnderPearlNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderSignal;
|
||||
|
|
@ -41,6 +44,11 @@ public class EnderSignalController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEnderSignalNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -33,6 +36,11 @@ public class EvokerFangsController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityEvokerFangsNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class ExperienceOrbController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityExperienceOrbNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
|
|
@ -55,6 +58,11 @@ public class FallingBlockController extends AbstractEntityController {
|
|||
}
|
||||
|
||||
public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityFallingBlockNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class FireworkController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityFireworkNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -34,6 +37,11 @@ public class FishingHookController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityFishingHookNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
|
|
@ -56,6 +59,11 @@ public class ItemController extends AbstractEntityController {
|
|||
}
|
||||
|
||||
public static class EntityItemNPC extends EntityItem implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityItemNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
|
|
@ -44,6 +47,11 @@ public class ItemFrameController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityItemFrameNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -28,6 +31,11 @@ public class LargeFireballController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityLargeFireballNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class LeashController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityLeashNPC extends EntityLeash implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityLeashNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
|
|
@ -40,6 +43,11 @@ public class LlamaSpitController extends AbstractEntityController {
|
|||
}
|
||||
|
||||
public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityLlamaSpitNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -28,6 +31,11 @@ public class MinecartChestController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartChestNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -28,6 +31,11 @@ public class MinecartCommandController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartCommandNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -28,6 +31,11 @@ public class MinecartFurnaceController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartFurnaceNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.entity.Minecart;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
|
|
@ -24,6 +27,11 @@ public class MinecartHopperController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartHopperNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -28,6 +31,11 @@ public class MinecartRideableController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartRideableNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.entity.Minecart;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
|
|
@ -24,6 +27,11 @@ public class MinecartSpawnerController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartSpawnerNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.entity.Minecart;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
|
|
@ -24,6 +27,11 @@ public class MinecartTNTController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityMinecartTNTNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class PaintingController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityPaintingNPC extends EntityPainting implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityPaintingNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class ShulkerBulletController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityShulkerBulletNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class SmallFireballController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySmallFireballNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -41,6 +44,11 @@ public class SnowballController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySnowballNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftArrow;
|
||||
|
|
@ -27,6 +30,11 @@ public class SpectralArrowController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntitySpectralArrowNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class TNTPrimedController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityTNTPrimedNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class ThrownExpBottleController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityThrownExpBottleNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -28,6 +31,11 @@ public class ThrownPotionController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityThrownPotionNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class ThrownTridentController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityThrownTridentNPC extends EntityThrownTrident implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityThrownTridentNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class TippedArrowController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityTippedArrowNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
|
||||
|
||||
import net.minecraft.server.v1_13_R2.Tag;
|
||||
import net.minecraft.server.v1_13_R2.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
|
||||
|
|
@ -27,6 +30,11 @@ public class WitherSkullController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
double mx = motX; double my = motY; double mz = motZ; boolean res = super.b(tag); if (!npc.isPushableByFluids()) { motX = mx; motY = my; motZ = mz; } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityWitherSkullNPC(World world) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
package net.citizensnpcs.nms.v1_14_R1.entity;
|
||||
package net.citizensnpcs.nms.v1_14_R1.entity;import net.minecraft.server.v1_14_R1.Vec3D;
|
||||
|
||||
import net.minecraft.server.v1_14_R1.Tag;
|
||||
import net.minecraft.server.v1_14_R1.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
|
||||
|
|
@ -48,6 +51,11 @@ public class BatController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityBatNPC extends EntityBat implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
Vec3D old = getMot().add(0, 0, 0); boolean res = super.b(tag); if (!npc.isPushableByFluids()) { this.setMot(old); } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityBatNPC(EntityTypes<? extends EntityBat> types, World world) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
package net.citizensnpcs.nms.v1_14_R1.entity;
|
||||
package net.citizensnpcs.nms.v1_14_R1.entity;import net.minecraft.server.v1_14_R1.Vec3D;
|
||||
|
||||
import net.minecraft.server.v1_14_R1.Tag;
|
||||
import net.minecraft.server.v1_14_R1.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
|
||||
|
|
@ -48,6 +51,11 @@ public class BlazeController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
Vec3D old = getMot().add(0, 0, 0); boolean res = super.b(tag); if (!npc.isPushableByFluids()) { this.setMot(old); } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityBlazeNPC(EntityTypes<? extends EntityBlaze> types, World world) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
package net.citizensnpcs.nms.v1_14_R1.entity;
|
||||
package net.citizensnpcs.nms.v1_14_R1.entity;import net.minecraft.server.v1_14_R1.Vec3D;
|
||||
|
||||
import net.minecraft.server.v1_14_R1.Tag;
|
||||
import net.minecraft.server.v1_14_R1.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
|
||||
|
|
@ -52,6 +55,11 @@ public class CatController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityCatNPC extends EntityCat implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
Vec3D old = getMot().add(0, 0, 0); boolean res = super.b(tag); if (!npc.isPushableByFluids()) { this.setMot(old); } return res;
|
||||
}
|
||||
|
||||
boolean calledNMSHeight = false;
|
||||
private final CitizensNPC npc;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
package net.citizensnpcs.nms.v1_14_R1.entity;
|
||||
package net.citizensnpcs.nms.v1_14_R1.entity;import net.minecraft.server.v1_14_R1.Vec3D;
|
||||
|
||||
import net.minecraft.server.v1_14_R1.Tag;
|
||||
import net.minecraft.server.v1_14_R1.FluidType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
|
||||
|
|
@ -51,6 +54,11 @@ public class CaveSpiderController extends MobEntityController {
|
|||
}
|
||||
|
||||
public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder {
|
||||
@Override
|
||||
public boolean b(Tag<FluidType> tag) {
|
||||
Vec3D old = getMot().add(0, 0, 0); boolean res = super.b(tag); if (!npc.isPushableByFluids()) { this.setMot(old); } return res;
|
||||
}
|
||||
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityCaveSpiderNPC(EntityTypes<? extends EntityCaveSpider> types, World world) {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue