From 57c566d735b944a659774ed01736a630540844ad Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Sat, 4 Jul 2020 11:13:53 -0700 Subject: [PATCH] fix location.cursor_on, entity.describe for zombies (profession bork) --- .../main/java/com/denizenscript/denizen/objects/EntityTag.java | 2 +- .../denizen/objects/properties/entity/EntityProfession.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 c1633e3d27..cd12d2e755 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -1567,7 +1567,7 @@ else if (mtr.angle == BlockFace.EAST) { } RayTraceResult traced = object.getWorld().rayTraceBlocks(object.getEyeLocation(), object.getEyeLocation().getDirection(), range); if (traced != null && traced.getHitBlock() != null) { - return new LocationTag(traced.getHitBlock().getWorld(), traced.getHitPosition()); + return new LocationTag(traced.getHitBlock().getLocation()); } return null; }); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java index 2df753c3fb..d96f1fecaf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java @@ -18,7 +18,6 @@ public static boolean describes(ObjectTag entity) { return false; } return ((EntityTag) entity).getBukkitEntityType() == EntityType.VILLAGER - || ((EntityTag) entity).getBukkitEntityType() == EntityType.ZOMBIE || ((EntityTag) entity).getBukkitEntityType() == EntityType.ZOMBIE_VILLAGER; } @@ -102,7 +101,7 @@ public void adjust(Mechanism mechanism) { // <--[mechanism] // @object EntityTag // @name profession - // @input Element + // @input ElementTag // @description // Changes the entity's profession. // Currently, only Villager-type entities can have professions.