Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-21 20:14:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix bad getBukkitEntity if condition

Browse Source
This commit is contained in:
fullwall 2016-12-04 02:00:36 +08:00
parent e68e9ad5c6
commit 9329c66667
146 changed files with 179 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
View File

@ -124,7 +124,7 @@ public class BatController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new BatNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
View File

@ -123,7 +123,7 @@ public class BlazeController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new BlazeNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
View File

@ -148,7 +148,7 @@ public class CaveSpiderController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new CaveSpiderNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
View File

@ -159,7 +159,7 @@ public class ChickenController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new ChickenNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
View File

@ -160,7 +160,7 @@ public class CowController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new CowNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
View File

@ -159,7 +159,7 @@ public class CreeperController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new CreeperNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
View File

@ -122,7 +122,7 @@ public class EnderDragonController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new EnderDragonNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
View File

@ -147,7 +147,7 @@ public class EndermanController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new EndermanNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
View File

@ -147,7 +147,7 @@ public class EndermiteController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new EndermiteNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
View File

@ -114,7 +114,7 @@ public class GhastController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new GhastNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
View File

@ -133,7 +133,7 @@ public class GiantController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new GiantNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
View File

@ -134,7 +134,7 @@ public class GuardianController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new GuardianNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
View File

@ -163,7 +163,7 @@ public class HorseController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new HorseNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
View File

@ -133,7 +133,7 @@ public class IronGolemController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new IronGolemNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
View File

@ -136,7 +136,7 @@ public class MagmaCubeController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new MagmaCubeNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java
View File

@ -145,7 +145,7 @@ public class MushroomCowController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new MushroomCowNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
View File

@ -144,7 +144,7 @@ public class OcelotController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new OcelotNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java
View File

@ -146,7 +146,7 @@ public class PigController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new PigNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java
View File

@ -135,7 +135,7 @@ public class PigZombieController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new PigZombieNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java
View File

@ -120,7 +120,7 @@ public class PolarBearController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new PolarBearNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java
View File

@ -146,7 +146,7 @@ public class RabbitController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new RabbitNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java
View File

@ -144,7 +144,7 @@ public class SheepController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SheepNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
View File

@ -134,7 +134,7 @@ public class ShulkerController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new ShulkerNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java
View File

@ -133,7 +133,7 @@ public class SilverfishController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SilverfishNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java
View File

@ -133,7 +133,7 @@ public class SkeletonController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SkeletonNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java
View File

@ -145,7 +145,7 @@ public class SlimeController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SlimeNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java
View File

@ -133,7 +133,7 @@ public class SnowmanController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SnowmanNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java
View File

@ -133,7 +133,7 @@ public class SpiderController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SpiderNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java
View File

@ -133,7 +133,7 @@ public class SquidController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SquidNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
View File

@ -167,7 +167,7 @@ public class VillagerController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new VillagerNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java
View File

@ -133,7 +133,7 @@ public class WitchController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new WitchNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
View File

@ -108,7 +108,7 @@ public class WitherController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new WitherNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java
View File

@ -147,7 +147,7 @@ public class WolfController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new WolfNPC(this);
return super.getBukkitEntity();
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java
View File

@ -133,7 +133,7 @@ public class ZombieController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new ZombieNPC(this);
return super.getBukkitEntity();
}

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

@ -92,7 +92,7 @@ public class AreaEffectCloudController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new AreaEffectCloudNPC(this);
}
return super.getBukkitEntity();

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

@ -111,7 +111,7 @@ public class ArmorStandController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ArmorStandNPC(this);
}
return super.getBukkitEntity();

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

@ -93,7 +93,7 @@ public class BoatController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new BoatNPC(this);
}
return super.getBukkitEntity();

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

@ -93,7 +93,7 @@ public class DragonFireballController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new DragonFireballNPC(this);
}
return super.getBukkitEntity();

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

@ -108,7 +108,7 @@ public class EggController extends AbstractEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EggNPC(this);
}
return super.getBukkitEntity();

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

@ -92,7 +92,7 @@ public class EnderCrystalController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EnderCrystalNPC(this);
}
return super.getBukkitEntity();

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

@ -92,7 +92,7 @@ public class EnderPearlController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EnderPearlNPC(this);
}
return super.getBukkitEntity();

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

@ -92,7 +92,7 @@ public class EnderSignalController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EnderSignalNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class ExperienceOrbController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ExperienceOrbNPC(this);
}
return super.getBukkitEntity();

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

@ -107,7 +107,7 @@ public class FallingBlockController extends AbstractEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new FallingBlockNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class FireworkController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new FireworkNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class FishingHookController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new FishingHookNPC(this);
}
return super.getBukkitEntity();

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

@ -107,7 +107,7 @@ public class ItemController extends AbstractEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ItemNPC(this);
}
return super.getBukkitEntity();

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

@ -92,7 +92,7 @@ public class ItemFrameController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ItemFrameNPC(this);
}
return super.getBukkitEntity();

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

@ -79,7 +79,7 @@ public class LargeFireballController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new LargeFireballNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class LeashController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new LeashNPC(this);
}
return super.getBukkitEntity();

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

@ -87,7 +87,7 @@ public class MinecartChestController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new MinecartChestNPC(this);
}
return super.getBukkitEntity();

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

@ -87,7 +87,7 @@ public class MinecartCommandController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new MinecartCommandNPC(this);
}
return super.getBukkitEntity();

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

@ -87,7 +87,7 @@ public class MinecartFurnaceController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new MinecartFurnaceNPC(this);
}
return super.getBukkitEntity();

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

@ -87,7 +87,7 @@ public class MinecartRideableController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new MinecartRideableNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class PaintingController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new PaintingNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class ShulkerBulletController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ShulkerBulletNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class SmallFireballController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new SmallFireballNPC(this);
}
return super.getBukkitEntity();

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

@ -92,7 +92,7 @@ public class SnowballController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new SnowballNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class SpectralArrowController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new SpectralArrowNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class TNTPrimedController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new TNTPrimedNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class ThrownExpBottleController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ThrownExpBottleNPC(this);
}
return super.getBukkitEntity();

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

@ -79,7 +79,7 @@ public class ThrownPotionController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
if (getItem() != null && getItem().getItem().equals(Items.LINGERING_POTION)) {
bukkitEntity = new LingeringThrownPotionNPC(this);
} else {

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

@ -78,7 +78,7 @@ public class TippedArrowController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new TippedArrowNPC(this);
}
return super.getBukkitEntity();

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

@ -78,7 +78,7 @@ public class WitherSkullController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new WitherSkullNPC(this);
}
return super.getBukkitEntity();

5
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -481,8 +481,9 @@ public class NMSImpl implements NMSBridge {
@Override
public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
Entity e = NMSImpl.getHandle(entity).getVehicle();
return e == NMSImpl.getHandle(entity) ? null : e.getBukkitEntity();
Entity handle = NMSImpl.getHandle(entity);
Entity e = handle.getVehicle();
return (e == handle || e == null) ? null : e.getBukkitEntity();
}
@Override

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java
View File

@ -124,8 +124,9 @@ public class BatController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new BatNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java
View File

@ -123,8 +123,9 @@ public class BlazeController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new BlazeNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java
View File

@ -148,8 +148,9 @@ public class CaveSpiderController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new CaveSpiderNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java
View File

@ -159,8 +159,9 @@ public class ChickenController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new ChickenNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java
View File

@ -160,8 +160,9 @@ public class CowController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new CowNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java
View File

@ -150,8 +150,9 @@ public class CreeperController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new CreeperNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java
View File

@ -122,8 +122,9 @@ public class EnderDragonController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EnderDragonNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java
View File

@ -147,8 +147,9 @@ public class EndermanController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EndermanNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java
View File

@ -147,8 +147,9 @@ public class EndermiteController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EndermiteNPC(this);
}
return super.getBukkitEntity();
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
View File

@ -247,7 +247,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
@Override
public CraftPlayer getBukkitEntity() {
if (npc != null && bukkitEntity == null) {
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new PlayerNPC(this);
}
return super.getBukkitEntity();

4
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java
View File

@ -13,7 +13,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_11_R1.BlockPosition;
import net.minecraft.server.v1_11_R1.EntityEvoker;
@ -135,8 +134,9 @@ public class EvokerController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new EvokerNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java
View File

@ -114,8 +114,9 @@ public class GhastController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new GhastNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java
View File

@ -133,8 +133,9 @@ public class GiantController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new GiantNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java
View File

@ -134,8 +134,9 @@ public class GuardianController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new GuardianNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java
View File

@ -134,8 +134,9 @@ public class GuardianElderController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new GuardianElderNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java
View File

@ -155,8 +155,9 @@ public class HorseController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new HorseNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java
View File

@ -156,8 +156,9 @@ public class HorseDonkeyController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new HorseDonkeyNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java
View File

@ -156,8 +156,9 @@ public class HorseMuleController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new HorseMuleNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java
View File

@ -156,8 +156,9 @@ public class HorseSkeletonController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new HorseSkeletonNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java
View File

@ -156,8 +156,9 @@ public class HorseZombieController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new HorseZombieNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java
View File

@ -133,8 +133,9 @@ public class IronGolemController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new IronGolemNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java
View File

@ -155,8 +155,9 @@ public class LlamaController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new LlamaNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java
View File

@ -144,8 +144,9 @@ public class MagmaCubeController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new MagmaCubeNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java
View File

@ -145,8 +145,9 @@ public class MushroomCowController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new MushroomCowNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java
View File

@ -144,8 +144,9 @@ public class OcelotController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new OcelotNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java
View File

@ -146,8 +146,9 @@ public class PigController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new PigNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java
View File

@ -135,8 +135,9 @@ public class PigZombieController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new PigZombieNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java
View File

@ -120,8 +120,9 @@ public class PolarBearController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new PolarBearNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java
View File

@ -146,8 +146,9 @@ public class RabbitController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new RabbitNPC(this);
}
return super.getBukkitEntity();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java
View File

@ -144,8 +144,9 @@ public class SheepController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
bukkitEntity = new SheepNPC(this);
}
return super.getBukkitEntity();
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java
View File

@ -143,7 +143,7 @@ public class ShulkerController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new ShulkerNPC(this);
return super.getBukkitEntity();
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java
View File

@ -133,7 +133,7 @@ public class SilverfishController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SilverfishNPC(this);
return super.getBukkitEntity();
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java
View File

@ -133,7 +133,7 @@ public class SkeletonController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SkeletonNPC(this);
return super.getBukkitEntity();
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java
View File

@ -133,7 +133,7 @@ public class SkeletonStrayController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new StrayNPC(this);
return super.getBukkitEntity();
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java
View File

@ -133,7 +133,7 @@ public class SkeletonWitherController extends MobEntityController {
@Override
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null && npc != null)
if (npc != null && !(bukkitEntity instanceof NPCHolder))
bukkitEntity = new SkeletonWitherNPC(this);
return super.getBukkitEntity();
}

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