Skip to content

Commit 984f3c9

Browse files
committed
ops
1 parent bfbbbbd commit 984f3c9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/MiNET/MiNET/Entities/Projectiles/Projectile.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public override void OnTick(Entity[] entities)
116116

117117
bool collided = false;
118118
Block collidedWithBlock = null;
119-
if (entityCollided != null)
119+
if (entityCollided != null && Damage >= 0)
120120
{
121121
double speed = Math.Sqrt(Velocity.X * Velocity.X + Velocity.Y * Velocity.Y + Velocity.Z * Velocity.Z);
122122
double damage = Math.Ceiling(speed * Damage);
@@ -143,14 +143,16 @@ public override void OnTick(Entity[] entities)
143143
player.LastAttackTarget = entityCollided;
144144
}
145145

146+
entityCollided.HealthManager.TakeHit(this, (int) damage, DamageCause.Projectile);
146147
entityCollided.HealthManager.LastDamageSource = Shooter;
147148
OnHitEntity(entityCollided);
148149
DespawnEntity();
149-
150-
if (damage == -1) { return; }
151-
152-
entityCollided.HealthManager.TakeHit(this, (int) damage, DamageCause.Projectile);
153150
return;
151+
}else if (entityCollided != null && Damage == -1)
152+
{
153+
entityCollided.HealthManager.LastDamageSource = Shooter;
154+
OnHitEntity(entityCollided);
155+
DespawnEntity();
154156
}
155157
else
156158
{

0 commit comments

Comments
 (0)