diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntity.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntity.java index 9438a5d96..5d437e92b 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntity.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntity.java @@ -4,6 +4,8 @@ import org.bukkit.entity.Animals; import org.bukkit.entity.Entity; import org.bukkit.entity.Monster; +import org.bukkit.entity.Vehicle; +import org.bukkit.entity.ArmorStand; class MobEntity { @@ -23,6 +25,8 @@ boolean isMatch(Entity entity) { return switch (this.mobType) { case PASSIVE -> EntityUtil.is(entity, Animals.class); case AGGRESSIVE -> EntityUtil.is(entity, Monster.class); + case VEHICLE -> EntityUtil.is(entity, Vehicle.class); + case ARMOR_STAND -> EntityUtil.is(entity, ArmorStand.class); case OTHER -> EntityUtil.is(entity, this.entityClass); case ALL -> EntityUtil.isMob(entity); }; diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntityArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntityArgument.java index e1b006211..0ed2ff007 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntityArgument.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobEntityArgument.java @@ -54,7 +54,7 @@ public ParseResult parse(Invocation invocation, String @Override public SuggestionResult suggest(Invocation invocation, Argument argument, SuggestionContext context) { - Stream mobTypeStream = Stream.of(MobType.values()).filter(MobType::isSuggeestable); + Stream mobTypeStream = Stream.of(MobType.values()).filter(MobType::isSuggestable); Stream entityTypeStream = Stream.of(EntityType.values()).filter(EntityUtil::isMob); return Stream.concat(entityTypeStream, mobTypeStream) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobType.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobType.java index a1943686c..1bc4ac2b7 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobType.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/MobType.java @@ -4,22 +4,24 @@ enum MobType { PASSIVE(true, true), AGGRESSIVE(true, true), - OTHER(false, false), + VEHICLE(true, true), + ARMOR_STAND(true, true), + OTHER(true, false), ALL(true, true); private final boolean isParseable; - private final boolean isSuggeestable; + private final boolean isSuggestable; - MobType(boolean isParseable, boolean isSuggeestable) { + MobType(boolean isParseable, boolean isSuggestible) { this.isParseable = isParseable; - this.isSuggeestable = isSuggeestable; + this.isSuggestable = isSuggestible; } boolean isParseable() { return this.isParseable; } - boolean isSuggeestable() { - return this.isSuggeestable; + boolean isSuggestable() { + return this.isSuggestable; } }