From ed8b4c95a53b05e21ed7a97a69bf317c24258b68 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 27 Feb 2021 16:48:34 +0000 Subject: [PATCH] Added persistent meta key illusioner:illusioner to distinguish from other illusioners --- .../willfp/illusioner/proxy/v1_15_R1/EntityIllusioner.java | 4 ++++ .../willfp/illusioner/proxy/v1_16_R1/EntityIllusioner.java | 4 ++++ .../willfp/illusioner/proxy/v1_16_R2/EntityIllusioner.java | 4 ++++ .../willfp/illusioner/proxy/v1_16_R3/EntityIllusioner.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/illusioner/proxy/v1_15_R1/EntityIllusioner.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/illusioner/proxy/v1_15_R1/EntityIllusioner.java index 20ac0cb..7e615ce 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/illusioner/proxy/v1_15_R1/EntityIllusioner.java +++ b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/illusioner/proxy/v1_15_R1/EntityIllusioner.java @@ -25,8 +25,10 @@ import org.bukkit.attribute.Attribute; import org.bukkit.boss.BarFlag; import org.bukkit.boss.BossBar; import org.bukkit.craftbukkit.v1_15_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_15_R1.util.CraftNamespacedKey; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; public class EntityIllusioner extends EntityIllagerIllusioner implements EntityIllusionerProxy { @@ -48,6 +50,8 @@ public class EntityIllusioner extends EntityIllagerIllusioner implements EntityI public EntityIllusioner(@NotNull final Location location) { super(EntityTypes.ILLUSIONER, ((CraftWorld) location.getWorld()).getHandle()); + this.getBukkitEntity().getPersistentDataContainer().set(CraftNamespacedKey.fromString("illusioner:illusioner"), PersistentDataType.INTEGER, 1); + this.displayName = IllusionerManager.OPTIONS.getName(); this.setPosition(location.getX(), location.getY(), location.getZ()); diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/illusioner/proxy/v1_16_R1/EntityIllusioner.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/illusioner/proxy/v1_16_R1/EntityIllusioner.java index debd3fa..352660a 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/illusioner/proxy/v1_16_R1/EntityIllusioner.java +++ b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/illusioner/proxy/v1_16_R1/EntityIllusioner.java @@ -25,8 +25,10 @@ import org.bukkit.attribute.Attribute; import org.bukkit.boss.BarFlag; import org.bukkit.boss.BossBar; import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R1.util.CraftNamespacedKey; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; public class EntityIllusioner extends EntityIllagerIllusioner implements EntityIllusionerProxy { @@ -48,6 +50,8 @@ public class EntityIllusioner extends EntityIllagerIllusioner implements EntityI public EntityIllusioner(@NotNull final Location location) { super(EntityTypes.ILLUSIONER, ((CraftWorld) location.getWorld()).getHandle()); + this.getBukkitEntity().getPersistentDataContainer().set(CraftNamespacedKey.fromString("illusioner:illusioner"), PersistentDataType.INTEGER, 1); + this.displayName = IllusionerManager.OPTIONS.getName(); this.setPosition(location.getX(), location.getY(), location.getZ()); diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/illusioner/proxy/v1_16_R2/EntityIllusioner.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/illusioner/proxy/v1_16_R2/EntityIllusioner.java index 627d3f8..c53f9c8 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/illusioner/proxy/v1_16_R2/EntityIllusioner.java +++ b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/illusioner/proxy/v1_16_R2/EntityIllusioner.java @@ -25,8 +25,10 @@ import org.bukkit.attribute.Attribute; import org.bukkit.boss.BarFlag; import org.bukkit.boss.BossBar; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.util.CraftNamespacedKey; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; public class EntityIllusioner extends EntityIllagerIllusioner implements EntityIllusionerProxy { @@ -48,6 +50,8 @@ public class EntityIllusioner extends EntityIllagerIllusioner implements EntityI public EntityIllusioner(@NotNull final Location location) { super(EntityTypes.ILLUSIONER, ((CraftWorld) location.getWorld()).getHandle()); + this.getBukkitEntity().getPersistentDataContainer().set(CraftNamespacedKey.fromString("illusioner:illusioner"), PersistentDataType.INTEGER, 1); + this.displayName = IllusionerManager.OPTIONS.getName(); this.setPosition(location.getX(), location.getY(), location.getZ()); diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/illusioner/proxy/v1_16_R3/EntityIllusioner.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/illusioner/proxy/v1_16_R3/EntityIllusioner.java index ef61d64..936215c 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/illusioner/proxy/v1_16_R3/EntityIllusioner.java +++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/illusioner/proxy/v1_16_R3/EntityIllusioner.java @@ -25,8 +25,10 @@ import org.bukkit.attribute.Attribute; import org.bukkit.boss.BarFlag; import org.bukkit.boss.BossBar; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.util.CraftNamespacedKey; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; public class EntityIllusioner extends EntityIllagerIllusioner implements EntityIllusionerProxy { @@ -48,6 +50,8 @@ public class EntityIllusioner extends EntityIllagerIllusioner implements EntityI public EntityIllusioner(@NotNull final Location location) { super(EntityTypes.ILLUSIONER, ((CraftWorld) location.getWorld()).getHandle()); + this.getBukkitEntity().getPersistentDataContainer().set(CraftNamespacedKey.fromString("illusioner:illusioner"), PersistentDataType.INTEGER, 1); + this.displayName = IllusionerManager.OPTIONS.getName(); this.setPosition(location.getX(), location.getY(), location.getZ());