Merge branch 'master' into 1.19.63 fix entities falling

subcommands/world/entity.go

@@ -23,7 +23,6 @@ type entityState struct {
 }
 
 type serverEntityType struct {
-	world.SaveableEntityType
 	Encoded string
 	NBT     map[string]any
 }
@@ -49,6 +48,8 @@ type serverEntity struct {
 	EntityType serverEntityType
 }
 
+var _ world.SaveableEntityType = &serverEntityType{}
+
 func (e serverEntity) Type() world.EntityType {
 	return e.EntityType
 }

utils/behaviourpack/entity.go

@@ -73,12 +73,5 @@ func (bp *BehaviourPack) AddEntity(entity EntityIn) {
 		}
 	}
 
-	hasCollision := entity.Meta.Flag(protocol.EntityDataKeyFlags, protocol.EntityDataFlagHasCollision)
-	hasGravity := entity.Meta.Flag(protocol.EntityDataKeyFlags, protocol.EntityDataFlagHasGravity)
-	entry.MinecraftEntity.Components["minecraft:physics"] = map[string]any{
-		"has_collision": hasCollision,
-		"has_gravity":   hasGravity,
-	}
-
 	bp.entities[entity.Identifier] = entry
 }