Merge branch 'develop' into test-shop

Terasology · Aug 5, 2021 · 90ee90e · 90ee90e
2 parents b8c9532 + 9788c7e
commit 90ee90e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/assets/prefabs/magicStaff.prefab b/assets/prefabs/magicStaff.prefab
@@ -10,5 +10,9 @@
     "RaycastOnActivate": {},
     "Purchasable": {
         "cost" : 10
-    }
+    },
+    "Range": {
+        "range": 30.0
+    },
+    "FlagDropOnActivate": {}
 }
diff --git a/...in/java/org/terasology/lightandshadowresources/components/RaycastOnActivateComponent.java b/...in/java/org/terasology/lightandshadowresources/components/RaycastOnActivateComponent.java