Merge remote-tracking branch 'StellarWitch7/master' into fork/Stellar…

…Witch7/master
enjarai · Jul 6, 2024 · 3f1d0a3 · 3f1d0a3
2 parents d25129b + e63e716
commit 3f1d0a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/dev/enjarai/trickster/spell/SpellPart.java b/src/main/java/dev/enjarai/trickster/spell/SpellPart.java
@@ -35,8 +35,12 @@ public SpellPart(Fragment glyph, List<Optional<SpellPart>> subParts) {
         this.subParts = new ArrayList<>(subParts);
     }
 
+    public SpellPart(Fragment glyph) {
+        this(glyph, new ArrayList<>());
+    }
+
     public SpellPart() {
-        this(new PatternGlyph(), new ArrayList<>());
+        this(new PatternGlyph());
     }
 
     @Override

diff --git a/src/main/java/dev/enjarai/trickster/spell/tricks/entity/AddVelocityTrick.java b/src/main/java/dev/enjarai/trickster/spell/tricks/entity/AddVelocityTrick.java
@@ -21,16 +21,14 @@ public AddVelocityTrick() {
     @Override
     public Fragment activate(SpellContext ctx, List<Fragment> fragments) throws BlunderException {
         var entity = expectInput(fragments, FragmentType.ENTITY, 0);
-        var velocity = expectInput(fragments, FragmentType.VECTOR, 1);
-
         var target = entity.getEntity(ctx).orElseThrow(() -> new UnknownEntityBlunder(this));
 
         if (target instanceof PlayerEntity player) {
             fragments = ModEntityCumponents.WARD.get(player)
-                    .run(ctx, this, new SpellPart(new PatternGlyph(4, 6, 0, 1, 2, 8, 4), new ArrayList<>()), fragments);
-            velocity = expectInput(fragments, FragmentType.VECTOR, 1);
+                    .run(ctx, this, new SpellPart(new PatternGlyph(pattern)), fragments);
         }
 
+        var velocity = expectInput(fragments, FragmentType.VECTOR, 1);
         ctx.useMana(this, (float)velocity.vector().length() * 4);
         target.addVelocity(velocity.vector().x(), velocity.vector().y(), velocity.vector().z());
         target.velocityModified = true;