entity/projectile.go: Fix projectiles always doing base damage

DaPigGuy · DaPigGuy · commit d5294678bcd2 · 2025-01-29T23:12:17.000-08:00
diff --git a/server/entity/projectile.go b/server/entity/projectile.go
@@ -263,7 +263,7 @@ func (lt *ProjectileBehaviour) hitEntity(l Living, e *Ent, vel mgl64.Vec3) {
 	if lt.conf.Critical {
 		dmg += rand.Float64() * dmg / 2
 	}
-	if _, vulnerable := l.Hurt(lt.conf.Damage, src); vulnerable {
+	if _, vulnerable := l.Hurt(dmg, src); vulnerable {
 		l.KnockBack(l.Position().Sub(vel), 0.45+lt.conf.KnockBackForceAddend, 0.3608+lt.conf.KnockBackHeightAddend)
 
 		for _, eff := range lt.conf.Potion.Effects() {

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ func (lt ProjectileBehaviour) hitEntity(l Living, e Ent, vel mgl64.Vec3) {`
`263`	`263`	`if lt.conf.Critical {`
`264`	`264`	`dmg += rand.Float64() * dmg / 2`
`265`	`265`	`}`
`266`		`- if _, vulnerable := l.Hurt(lt.conf.Damage, src); vulnerable {`
	`266`	`+ if _, vulnerable := l.Hurt(dmg, src); vulnerable {`
`267`	`267`	`l.KnockBack(l.Position().Sub(vel), 0.45+lt.conf.KnockBackForceAddend, 0.3608+lt.conf.KnockBackHeightAddend)`
`268`	`268`
`269`	`269`	`for _, eff := range lt.conf.Potion.Effects() {`