diff --git a/README.md b/README.md index b52f274fb6..788a2e7dbd 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ An implementation of the Denizen Scripting Language for Spigot servers, with str **Version 1.1.5**: Compatible with Spigot 1.13.2, 1.14.4, 1.15.2, and 1.16.1! +**Learn about Denizen from the Beginner's guide:** https://guide.denizenscript.com/guides/background/index.html + #### Download Links: - **Release builds**: https://ci.citizensnpcs.co/job/Denizen/ diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java index 1f90313e9c..09c91fd735 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java @@ -156,7 +156,7 @@ public boolean addHide(UUID player, UUID entity) { return hidden.add(player); } - public void hideEntity(Player player, Entity entity, boolean keepInTabList) { // TODO: remove or reimplement tablist option somehow? + public void hideEntity(Player player, Entity entity) { if (player == null) { addHide(DEFAULT_HIDE, entity.getUniqueId()); if (entity instanceof Player) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java index aa3a878266..81cdc8d9e6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -3095,7 +3095,7 @@ && getBukkitEntity() instanceof Sheep) { // Works with offline players. // --> if (mechanism.matches("hide_from_players")) { - NMSHandler.getEntityHelper().hideEntity(null, getBukkitEntity(), false); + NMSHandler.getEntityHelper().hideEntity(null, getBukkitEntity()); } // <--[mechanism] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java index ca2176c9c0..20492c60c8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java @@ -3023,10 +3023,9 @@ public void adjust(Mechanism mechanism) { // <--[mechanism] // @object PlayerTag // @name hide_entity - // @input EntityTag(|ElementTag(Boolean)) + // @input EntityTag // @description // Hides an entity from the player. - // You can optionally also specify a boolean to determine whether the entity should be kept in the tab list (players only). // --> if (mechanism.matches("hide_entity")) { if (!mechanism.getValue().asString().isEmpty()) { @@ -3036,12 +3035,8 @@ public void adjust(Mechanism mechanism) { if (!entity.isSpawnedOrValidForTag()) { Debug.echoError("Can't hide the unspawned entity '" + split.get(0) + "'!"); } - else if (split.size() > 1 && new ElementTag(split.get(1)).isBoolean()) { - NMSHandler.getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity(), - new ElementTag(split.get(1)).asBoolean()); - } else { - NMSHandler.getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity(), false); + NMSHandler.getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity()); } } else {