Merge pull request #302 from Controllerdestiny/main

修复: EconomicsAPI 无法生成弹幕以及陷阱弹幕无法对敌怪照成伤害
UnrealMultiple · Jul 15, 2024 · 56fa86a · 56fa86a
2 parents 16e1c8e + db91d20
commit 56fa86a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Economics.Projectile/Plugin.cs b/Economics.Projectile/Plugin.cs
@@ -53,6 +53,7 @@ private void Projectile_Damage(On.Terraria.Projectile.orig_Damage orig, Terraria
                 self.Minion_FindTargetInRange(1500, ref id, false);
             }
         }
+        orig(self);
     }
 
     private void Projectile_Minion_FindTargetInRange(On.Terraria.Projectile.orig_Minion_FindTargetInRange orig, Terraria.Projectile self, int startAttackRange, ref int attackTarget, bool skipIfCannotHitWithOwnBody, Func<Entity, int, bool> customEliminationCheck)
@@ -115,6 +116,7 @@ private void Projectile_Minion_FindTargetInRange(On.Terraria.Projectile.orig_Min
                 }
             }
         }
+        orig(self, startAttackRange, ref attackTarget, skipIfCannotHitWithOwnBody, customEliminationCheck);
     }
 
     private void Onupdate(EventArgs args)

diff --git a/EconomicsAPI/Utils/SpawnProjectile.cs b/EconomicsAPI/Utils/SpawnProjectile.cs
@@ -19,7 +19,7 @@ public static int NewProjectile(IEntitySource spawnSource, float X, float Y, flo
             Owner = Main.myPlayer;
         }
         int num = 1000;
-        for (int i = 9999; i > 0; i--)
+        for (int i = 999; i > 0; i--)
         {
             if (!Main.projectile[i].active)
             {