session/entity_metadata.go: Always set EntityDataKeyHasNPC

df-mc · Nov 28, 2024 · 2ff5143 · 2ff5143
1 parent 11f0fe1
commit 2ff5143
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/server/session/entity_metadata.go b/server/session/entity_metadata.go
@@ -25,6 +25,7 @@ func (s *Session) parseEntityMetadata(e world.Entity) protocol.EntityMetadata {
 	m[protocol.EntityDataKeyEffectColor] = int32(0)
 	m[protocol.EntityDataKeyEffectAmbience] = byte(0)
 	m[protocol.EntityDataKeyColorIndex] = byte(0)
+	m[protocol.EntityDataKeyHasNPC] = uint8(1)
 
 	m.SetFlag(protocol.EntityDataKeyFlags, protocol.EntityDataFlagHasGravity)
 	m.SetFlag(protocol.EntityDataKeyFlags, protocol.EntityDataFlagClimb)
@@ -163,9 +164,6 @@ func (s *Session) addSpecificMetadata(e any, m protocol.EntityMetadata) {
 		}
 		m[protocol.EntityDataKeyVisibleMobEffects] = packedEffects
 	}
-	if d, ok := e.(dialogueProvider); ok {
-		m[protocol.EntityDataKeyHasNPC] = boolByte(d.CanShowDialogue())
-	}
 	if v, ok := e.(variable); ok {
 		m[protocol.EntityDataKeyVariant] = v.Variant()
 	}
@@ -282,7 +280,3 @@ type variable interface {
 type markVariable interface {
 	MarkVariant() int32
 }
-
-type dialogueProvider interface {
-	CanShowDialogue() bool
-}