diff --git a/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt b/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt index a8fce148da..b8ed54653f 100644 --- a/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt +++ b/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/EntityEntry.kt @@ -3,9 +3,7 @@ package com.typewritermc.engine.paper.entry.entries import com.typewritermc.core.entries.PriorityEntry import com.typewritermc.core.entries.Ref import com.typewritermc.core.entries.ref -import com.typewritermc.core.extension.annotations.Tags -import com.typewritermc.core.extension.annotations.Help -import com.typewritermc.core.extension.annotations.WithRotation +import com.typewritermc.core.extension.annotations.* import com.typewritermc.core.utils.point.Position import com.typewritermc.engine.paper.entry.* import com.typewritermc.engine.paper.entry.entity.* @@ -16,6 +14,8 @@ import kotlin.reflect.KClass @Tags("speaker") interface SpeakerEntry : PlaceholderEntry { + @Colored + @Placeholder @Help("将在聊天中显示的实体的名称(例如“Steve”或“Alex”)。") val displayName: String diff --git a/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt b/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt index 385c752d82..8fc49f9b29 100644 --- a/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt +++ b/extensions/EntityExtension/src/main/kotlin/com/typewritermc/entity/entries/entity/custom/EntityTypeProperty.kt @@ -7,6 +7,8 @@ import com.typewritermc.engine.paper.entry.entity.EntityState import com.typewritermc.engine.paper.entry.entries.EntityProperty import com.typewritermc.entity.entries.data.minecraft.PoseProperty import com.typewritermc.entity.entries.data.minecraft.living.AgableProperty +import com.typewritermc.entity.entries.data.minecraft.living.ScaleData +import com.typewritermc.entity.entries.data.minecraft.living.ScaleProperty import com.typewritermc.entity.entries.data.minecraft.living.SizeProperty import com.typewritermc.entity.entries.data.minecraft.living.pufferfish.PuffStateProperty import com.typewritermc.entity.entries.data.minecraft.other.MarkerProperty @@ -67,7 +69,7 @@ private fun EntityType.matcher(properties: Map, EntityProperty>): Enti fun EntityType.state(properties: Map, EntityProperty>): EntityState { val matcher = matcher(properties) return EntityState( - eyeHeight = matcher.eyeHeight, + eyeHeight = matcher.eyeHeight * (properties.property(ScaleProperty::class)?.scale ?: 1.0), ) }