From 6019f812d35ba8501099b751c1127173fc12b632 Mon Sep 17 00:00:00 2001 From: Ghoulboy Date: Mon, 27 Jun 2022 20:37:44 +0200 Subject: [PATCH] Making portal_timer and portal_cooldown return portal timer and portal cooldown in that order (#1476) * This error is so dumb I must have done it * Update ai_tracker.sc --- src/main/java/carpet/script/value/EntityValue.java | 4 ++-- src/main/resources/assets/carpet/scripts/ai_tracker.sc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 447c4c0b..6bbccb72 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -523,8 +523,8 @@ public class EntityValue extends Value put("item", (e, a) -> (e instanceof ItemEntity)?ValueConversions.of(((ItemEntity) e).getItem()):Value.NULL); put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getItem().getCount()):Value.NULL); put("pickup_delay", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntityInterface) e).getPickupDelayCM()):Value.NULL); - put("portal_cooldown", (e , a) ->new NumericValue(((EntityInterface)e).getPortalTimer())); - put("portal_timer", (e , a) ->new NumericValue(((EntityInterface)e).getPublicNetherPortalCooldown())); + put("portal_cooldown", (e , a) ->new NumericValue(((EntityInterface)e).getPublicNetherPortalCooldown())); + put("portal_timer", (e , a) ->new NumericValue(((EntityInterface)e).getPortalTimer())); // ItemEntity -> despawn timer via ssGetAge put("is_baby", (e, a) -> (e instanceof LivingEntity)?BooleanValue.of(((LivingEntity) e).isBaby()):Value.NULL); put("target", (e, a) -> { diff --git a/src/main/resources/assets/carpet/scripts/ai_tracker.sc b/src/main/resources/assets/carpet/scripts/ai_tracker.sc index b9ad7206..09148e90 100644 --- a/src/main/resources/assets/carpet/scripts/ai_tracker.sc +++ b/src/main/resources/assets/carpet/scripts/ai_tracker.sc @@ -270,9 +270,9 @@ global_functions = { 'portal_cooldown' -> { '*' -> [ _(arg) -> _(e) -> ( - portal_timer = e~'portal_timer'; - if (portal_timer, - [[], [], [['portal', 'portal cooldown:', portal_timer]]] + portal_cooldown = e~'portal_cooldown'; + if (portal_cooldown, + [[], [], [['portal', 'portal cooldown:', portal_cooldown]]] , [[], [], []] )