Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-27 06:42:57 +02:00
Code Issues Projects Releases Wiki Activity

Block force boat/minecart mounting

Browse Source
This commit is contained in:
fullwall 2020-06-12 19:49:25 +08:00
parent a591089d3c
commit 310c1ce52f
98 changed files with 748 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftBat;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -15,7 +16,9 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBat;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
import net.minecraft.server.v1_15_R1.SoundEffect;
@ -173,6 +176,14 @@ public class BatController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
public void setFlying(boolean flying) {
setAsleep(flying);
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftBee;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -15,7 +16,9 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBee;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
import net.minecraft.server.v1_15_R1.SoundEffect;
@ -172,5 +175,13 @@ public class BeeController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -15,7 +16,9 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBlaze;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
import net.minecraft.server.v1_15_R1.SoundEffect;
@ -166,5 +169,13 @@ public class BlazeController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftCat;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityCat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -214,5 +217,13 @@ public class CatController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityCaveSpider;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -205,6 +208,14 @@ public class CaveSpiderController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftChicken;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityChicken;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -223,5 +226,13 @@ public class ChickenController extends MobEntityController {
}
super.movementTick();
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftCod;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityCod;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -229,5 +232,13 @@ public class CodController extends MobEntityController {
this.v = lastInWater;
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftCow;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityCow;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -229,5 +232,13 @@ public class CowController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftCreeper;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityCreeper;
import net.minecraft.server.v1_15_R1.EntityLightning;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -205,6 +208,14 @@ public class CreeperController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void onLightningStrike(EntityLightning entitylightning) {
if (npc == null || allowPowered) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftDolphin;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityDolphin;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -215,6 +218,14 @@ public class DolphinController extends MobEntityController {
return false; // shouldLeash
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void tick() {
super.tick();

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftDrowned;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityDrowned;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -201,5 +204,13 @@ public class DrownedController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEnderDragon;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -15,6 +16,8 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityEnderDragon;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
@ -185,5 +188,13 @@ public class EnderDragonController extends MobEntityController {
super.movementTick();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEnderman;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityEnderman;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -210,6 +213,14 @@ public class EndermanController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEndermite;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityEndermite;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -201,6 +204,14 @@ public class EndermiteController extends MobEntityController {
npc.update();
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEvoker;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityEvoker;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class EvokerController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class EvokerNPC extends CraftEvoker implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftFox;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityFox;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -200,6 +203,14 @@ public class FoxController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class FoxNPC extends CraftFox implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftGhast;
@ -15,6 +16,8 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityGhast;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
@ -160,6 +163,14 @@ public class GhastController extends MobEntityController {
}
super.mobTick();
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class GhastNPC extends CraftGhast implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftGiant;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityGiantZombie;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class GiantController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftGuardian;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityGuardian;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -195,6 +198,14 @@ public class GuardianController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftElderGuardian;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityGuardianElder;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -195,6 +198,14 @@ public class GuardianElderController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -21,6 +22,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHorse;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GenericAttributes;
@ -246,6 +249,14 @@ public class HorseController extends MobEntityController {
npc.update();
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class HorseNPC extends CraftHorse implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftDonkey;
@ -21,6 +22,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHorseDonkey;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GenericAttributes;
@ -244,6 +247,14 @@ public class HorseDonkeyController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class HorseDonkeyNPC extends CraftDonkey implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -21,6 +22,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHorseMule;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GenericAttributes;
@ -244,6 +247,14 @@ public class HorseMuleController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class HorseMuleNPC extends CraftMule implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -21,6 +22,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHorseSkeleton;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GenericAttributes;
@ -245,6 +248,14 @@ public class HorseSkeletonController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class HorseSkeletonNPC extends CraftSkeletonHorse implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -21,6 +22,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHorseZombie;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GenericAttributes;
@ -245,6 +248,14 @@ public class HorseZombieController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class HorseZombieNPC extends CraftZombieHorse implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftIllusioner;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityIllagerIllusioner;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class IllusionerController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class IllusionerNPC extends CraftIllusioner implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftIronGolem;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityIronGolem;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class IronGolemController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -20,6 +21,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityLlama;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -216,6 +219,14 @@ public class LlamaController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class LlamaNPC extends CraftLlama implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftMagmaCube;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityMagmaCube;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -186,6 +189,14 @@ public class MagmaCubeController extends MobEntityController {
return false; // shouldLeash
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void pickup(EntityHuman human) {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftMushroomCow;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityMushroomCow;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -210,6 +213,14 @@ public class MushroomCowController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class MushroomCowNPC extends CraftMushroomCow implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftOcelot;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityOcelot;
import net.minecraft.server.v1_15_R1.EntityPose;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -207,6 +210,14 @@ public class OcelotController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class OcelotNPC extends CraftOcelot implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPanda;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityPanda;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -200,6 +203,14 @@ public class PandaController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class PandaNPC extends CraftPanda implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftParrot;
@ -15,6 +16,8 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityParrot;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -170,6 +173,14 @@ public class ParrotController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class ParrotNPC extends CraftParrot implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPhantom;
@ -19,6 +20,8 @@ import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerLook;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityPhantom;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EnumDifficulty;
@ -220,6 +223,14 @@ public class PhantomController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void tick() {
// avoid suicide

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPig;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityLightning;
import net.minecraft.server.v1_15_R1.EntityPig;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -209,6 +212,14 @@ public class PigController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void onLightningStrike(EntityLightning entitylightning) {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPigZombie;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityPigZombie;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -189,6 +192,14 @@ public class PigZombieController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class PigZombieNPC extends CraftPigZombie implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPillager;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityPillager;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -200,6 +203,14 @@ public class PillagerController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class PillagerNPC extends CraftPillager implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPolarBear;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityPolarBear;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
@ -167,6 +170,14 @@ public class PolarBearController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class PolarBearNPC extends CraftPolarBear implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPufferFish;
@ -19,6 +20,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityPose;
import net.minecraft.server.v1_15_R1.EntityPufferFish;
import net.minecraft.server.v1_15_R1.EntitySize;
@ -231,6 +234,14 @@ public class PufferFishController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void tick() {
if (npc != null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftRabbit;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityLiving;
import net.minecraft.server.v1_15_R1.EntityRabbit;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -213,6 +216,14 @@ public class RabbitController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void setRabbitType(int i) {
if (npc != null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftRavager;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityRavager;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -200,6 +203,14 @@ public class RavagerController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class RavagerNPC extends CraftRavager implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSalmon;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySalmon;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -213,6 +216,14 @@ public class SalmonController extends MobEntityController {
this.v = lastInWater;
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class SalmonNPC extends CraftSalmon implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSheep;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySheep;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -201,6 +204,14 @@ public class SheepController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class SheepNPC extends CraftSheep implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftShulker;
@ -16,7 +17,9 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityAIBodyControl;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityShulker;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -187,6 +190,14 @@ public class ShulkerController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
protected EntityAIBodyControl o() {
return new EntityAIBodyControl(this);

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSilverfish;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySilverfish;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -186,6 +189,14 @@ public class SilverfishController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSkeleton;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySkeleton;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class SkeletonController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftStray;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySkeletonStray;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class SkeletonStrayController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftWitherSkeleton;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySkeletonWither;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class SkeletonWitherController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSlime;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntitySlime;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -187,6 +190,14 @@ public class SlimeController extends MobEntityController {
return false; // shouldLeash
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void pickup(EntityHuman human) {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSnowman;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySnowman;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GameRules;
@ -201,6 +204,14 @@ public class SnowmanController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSpider;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySpider;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class SpiderController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSquid;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntitySquid;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class SquidController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java
View File

@ -3,6 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity;
import java.lang.invoke.MethodHandle;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
@ -22,6 +23,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityLlamaTrader;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -226,6 +229,14 @@ public class TraderLlamaController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
private static final MethodHandle bF = NMS.getSetter(EntityLlamaTrader.class, "bF");
}

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTropicalFish;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTropicalFish;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -215,6 +218,14 @@ public class TropicalFishController extends MobEntityController {
this.v = lastInWater;
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class TropicalFishNPC extends CraftTropicalFish implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTurtle;
@ -19,6 +20,8 @@ import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.ControllerJump;
import net.minecraft.server.v1_15_R1.ControllerMove;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityInsentient;
import net.minecraft.server.v1_15_R1.EntityTurtle;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -216,6 +219,14 @@ public class TurtleController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
static class EmptyControllerJump extends ControllerJump {
public EmptyControllerJump(EntityInsentient var1) {
super(var1);

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftVex;
@ -15,6 +16,8 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityVex;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
@ -154,6 +157,14 @@ public class VexController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class VexNPC extends CraftVex implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.TreeMap;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftVillager;
@ -21,6 +22,8 @@ import net.minecraft.server.v1_15_R1.BehaviorController;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityLightning;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -250,6 +253,14 @@ public class VillagerController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void onLightningStrike(EntityLightning entitylightning) {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftVindicator;
@ -17,6 +18,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityVindicator;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -202,6 +205,14 @@ public class VindicatorController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class VindicatorNPC extends CraftVindicator implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.TreeMap;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftWanderingTrader;
@ -20,6 +21,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityLightning;
import net.minecraft.server.v1_15_R1.EntityTypes;
@ -245,6 +248,14 @@ public class WanderingTraderController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void onLightningStrike(EntityLightning entitylightning) {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftWitch;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityWitch;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -188,6 +191,14 @@ public class WitchController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public void updateSize() {
if (npc == null) {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftWither;
@ -15,6 +16,8 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityWither;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
@ -160,6 +163,14 @@ public class WitherController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class WitherNPC extends CraftWither implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftWolf;
@ -18,6 +19,8 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityLiving;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityWolf;
@ -205,6 +208,14 @@ public class WolfController extends MobEntityController {
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
@Override
public boolean setGoalTarget(EntityLiving entityliving, EntityTargetEvent.TargetReason reason, boolean fire) {
return npc == null || this.equals(entityliving) ? super.setGoalTarget(entityliving, reason, fire) : false;

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftZombie;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityZombie;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -187,6 +190,14 @@ public class ZombieController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class ZombieNPC extends CraftZombie implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHusk;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityZombieHusk;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -187,6 +190,14 @@ public class ZombieHuskController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class ZombieHuskNPC extends CraftHusk implements NPCHolder {

11
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_15_R1.entity;
import org.bukkit.Bukkit;
import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftVillagerZombie;
@ -16,6 +17,8 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.DamageSource;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityBoat;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.EntityZombieVillager;
import net.minecraft.server.v1_15_R1.IBlockData;
@ -187,6 +190,14 @@ public class ZombieVillagerController extends MobEntityController {
npc.update();
}
}
@Override
protected boolean n(Entity entity) {
if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
return !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
}
return super.n(entity);
}
}
public static class ZombieVillagerNPC extends CraftVillagerZombie implements NPCHolder {

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftAreaEffectCloud;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftArmorStand;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftBoat;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftDragonFireball;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEnderCrystal;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEnderPearl;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEnderSignal;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEvokerFangs;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftExperienceOrb;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftFirework;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java
View File

@ -5,7 +5,7 @@ import java.util.UUID;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftFishHook;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftLargeFireball;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftLeash;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftMinecartChest;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftMinecartCommand;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftMinecartFurnace;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftMinecartRideable;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPainting;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftShulkerBullet;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSmallFireball;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftSnowball;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftArrow;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTNTPrimed;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftThrownExpBottle;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftThrownPotion;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTrident;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftArrow;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java
View File

@ -3,7 +3,7 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit;import net.minecraft.server.v1_15_R1.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftWitherSkull;