block/tnt.go: Implement ProjectileHitter

df-mc · Jan 7, 2025 · 16b0d3e · 16b0d3e
1 parent 19cb9d1
commit 16b0d3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/server/block/tnt.go b/server/block/tnt.go
@@ -16,6 +16,13 @@ type TNT struct {
 	solid
 }
 
+// ProjectileHit ...
+func (t TNT) ProjectileHit(pos cube.Pos, tx *world.Tx, e world.Entity, _ cube.Face) {
+	if f, ok := e.(flammableEntity); ok && f.OnFireDuration() > 0 {
+		t.Ignite(pos, tx, nil)
+	}
+}
+
 // Activate ...
 func (t TNT) Activate(pos cube.Pos, _ cube.Face, tx *world.Tx, u item.User, ctx *item.UseContext) bool {
 	held, _ := u.HeldItems()

diff --git a/server/entity/projectile.go b/server/entity/projectile.go
@@ -172,9 +172,6 @@ func (lt *ProjectileBehaviour) Tick(e *Ent, tx *world.Tx) *Movement {
 		}
 	case trace.BlockResult:
 		bpos := r.BlockPosition()
-		if t, ok := tx.Block(bpos).(block.TNT); ok && e.OnFireDuration() > 0 {
-			t.Ignite(bpos, tx, nil)
-		}
 		if h, ok := tx.Block(bpos).(block.ProjectileHitter); ok {
 			h.ProjectileHit(bpos, tx, e, r.Face())
 		}