From ce744802cfd1033132d546b9da8cb45602ccb71a Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 25 Dec 2019 03:10:32 -0400
Subject: [PATCH] cleanup

---
 src/main/java/carpet/script/Expression.java        | 11 ++---------
 src/main/resources/assets/carpet/scripts/camera.sc |  8 ++++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java
index 9ff9e44b..0bc27604 100644
--- a/src/main/java/carpet/script/Expression.java
+++ b/src/main/java/carpet/script/Expression.java
@@ -3045,16 +3045,9 @@ public class Expression implements Cloneable
             return ((ThreadValue) v).join();
         });
 
-        /*addUnaryFunction("stop_task", (v) -> {
+        addUnaryFunction("task_completed", (v) -> {
             if (!(v instanceof ThreadValue))
-                throw new InternalExpressionException("'join_task' could only be used with a task value");
-            ((ThreadValue) v).stop();
-            return Value.NULL;
-        });*/
-
-        addUnaryFunction("is_task_completed", (v) -> {
-            if (!(v instanceof ThreadValue))
-                throw new InternalExpressionException("'join_task' could only be used with a task value");
+                throw new InternalExpressionException("'task_completed' could only be used with a task value");
             return new NumericValue(((ThreadValue) v).isFinished());
         });
 
diff --git a/src/main/resources/assets/carpet/scripts/camera.sc b/src/main/resources/assets/carpet/scripts/camera.sc
index ffd9130c..225f6aec 100644
--- a/src/main/resources/assets/carpet/scripts/camera.sc
+++ b/src/main/resources/assets/carpet/scripts/camera.sc
@@ -8,7 +8,7 @@ __command() ->
    print(' "/camera prepend <N>" - prepend point <N> seconds before');
    print(' "/camera clear" - removes entire path');
    print(' "/camera select" - or punch a point, to select it');
-   print(' "/camera move" - moves selected camera to current player location');
+   print(' "/camera move" - moves selected point toplayer location');
    print(' "/camera duration <X>" - resizes current selected path');
    print(' "/camera split_point>" - splits current selected path in half');
    print(' "/camera delete_point" - removes current keypoint');
@@ -16,9 +16,9 @@ __command() ->
    print('');
    print(' "/camera store <name>"');
    print(' "/camera load <name>"');
-   print('    - stores and loads path from nbt files in /scripts world folder');
+   print('    - stores and loads paths from files in /scripts folder');
    print('');
-   print(' "/camera interpolation < linear | gauss | cr | gauss_<number> >"');
+   print(' "/camera interpolation < linear | gauss | cr | gauss_<num> >"');
    print('    Selects interpolation between points:');
    print('    - cr: Catmull-Rom interpolation (default).');
    print('        smooth path that goes through all points.');
@@ -42,7 +42,7 @@ __command() ->
    print('    use "sneak" to stop it prematurely');
    print('    run /camera hide and F1 to clear the view');
    print('');
-   print(' "/camera show": shows current path for a moment');
+   print(' "/camera show": shows current path');
    print('    color of particles used is different for different players');
    print(' "/camera hide": hides path display');
    print('');