icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making portal_timer and portal_cooldown return portal timer and portal cooldown in that order (#1476)

Browse Source 
* This error is so dumb I must have done it

* Update ai_tracker.sc
This commit is contained in:
Ghoulboy authored and GitHub committed 2022-06-27 20:37:44 +02:00
1 parent ee4bc332e3
commit 6019f812d3
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/value/EntityValue.java
+2 -2
View File
@@ -523,8 +523,8 @@ public class EntityValue extends Value
put("item", (e, a) -> (e instanceof ItemEntity)?ValueConversions.of(((ItemEntity) e).getItem()):Value.NULL); 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("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("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_cooldown", (e , a) ->new NumericValue(((EntityInterface)e).getPublicNetherPortalCooldown()));
put("portal_timer", (e , a) ->new NumericValue(((EntityInterface)e).getPublicNetherPortalCooldown())); put("portal_timer", (e , a) ->new NumericValue(((EntityInterface)e).getPortalTimer()));
// ItemEntity -> despawn timer via ssGetAge // ItemEntity -> despawn timer via ssGetAge
put("is_baby", (e, a) -> (e instanceof LivingEntity)?BooleanValue.of(((LivingEntity) e).isBaby()):Value.NULL); put("is_baby", (e, a) -> (e instanceof LivingEntity)?BooleanValue.of(((LivingEntity) e).isBaby()):Value.NULL);
put("target", (e, a) -> { put("target", (e, a) -> {
src/main/resources/assets/carpet/scripts/ai_tracker.sc
+3 -3
View File
@@ -270,9 +270,9 @@ global_functions = {
'portal_cooldown' -> { 'portal_cooldown' -> {
'*' -> [ '*' -> [
_(arg) -> _(e) -> ( _(arg) -> _(e) -> (
portal_timer = e~'portal_timer'; portal_cooldown = e~'portal_cooldown';
if (portal_timer, if (portal_cooldown,
[[], [], [['portal', 'portal cooldown:', portal_timer]]] [[], [], [['portal', 'portal cooldown:', portal_cooldown]]]
, ,
[[], [], []] [[], [], []]
) )