fix: Fix incorrect projective velocity

misc: 一些调整
NiFeather · Jan 29, 2024 · c8af611 · c8af611
1 parent ddc1745
commit c8af611
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/xiamomc/morph/skills/MorphSkill.java b/src/main/java/xiamomc/morph/skills/MorphSkill.java
@@ -69,7 +69,7 @@ protected <E extends Entity> E launchProjectile(Player player, EntityType fireba
         try
         {
             fireBall = player.getWorld()
-                    .spawnEntity(player.getEyeLocation(), fireball, CreatureSpawnEvent.SpawnReason.DEFAULT);
+                    .spawnEntity(player.getEyeLocation(), fireball, CreatureSpawnEvent.SpawnReason.CUSTOM);
         }
         catch (Throwable t)
         {
@@ -81,7 +81,12 @@ protected <E extends Entity> E launchProjectile(Player player, EntityType fireba
         if (fireBall instanceof Projectile projectile)
             projectile.setShooter(player);
 
-        fireBall.setVelocity(player.getEyeLocation().getDirection().normalize().multiply(1.4d * multiplier));
+        //It works for all previous MC versions, then starting from 1.20.3 we need to multiply 0.1 ...
+        //... right before we do any other things.
+        //
+        //Why?
+        var velocity = player.getEyeLocation().getDirection().normalize().multiply(0.1d);
+        fireBall.setVelocity(velocity.multiply(multiplier));
 
         return (E) fireBall;
     }

diff --git a/src/main/java/xiamomc/morph/skills/impl/LaunchProjectiveMorphSkill.java b/src/main/java/xiamomc/morph/skills/impl/LaunchProjectiveMorphSkill.java
@@ -84,10 +84,7 @@ protected void executeDelayedSkill(Player player, DisguiseState state, SkillAbil
         //region 发射后...
 
         if (entity instanceof ShulkerBullet bullet)
-        {
             bullet.setTarget(target);
-            bullet.setShooter(player);
-        }
 
         if (entity instanceof WitherSkull skull)
         {