mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Correctly cap scale attribute (#4856)
* Fix scale attribute cap * Update LivingEntity.java
This commit is contained in:
parent
6ab0186fc9
commit
49f66c2a02
2 changed files with 3 additions and 2 deletions
|
@ -49,7 +49,7 @@ public enum GeyserAttributeType {
|
|||
ATTACK_KNOCKBACK("minecraft:generic.attack_knockback", null, 1.5f, Float.MAX_VALUE, 0f),
|
||||
ATTACK_SPEED("minecraft:generic.attack_speed", null, 0f, 1024f, 4f),
|
||||
MAX_HEALTH("minecraft:generic.max_health", null, 0f, 1024f, 20f),
|
||||
SCALE("minecraft:generic.scale", null, 0.0625f, 16f, 1f), // Unused. Do we need this?
|
||||
SCALE("minecraft:generic.scale", null, 0.0625f, 16f, 1f),
|
||||
|
||||
// Bedrock Attributes
|
||||
ABSORPTION(null, "minecraft:absorption", 0f, 1024f, 0f),
|
||||
|
|
|
@ -48,6 +48,7 @@ import org.geysermc.geyser.session.GeyserSession;
|
|||
import org.geysermc.geyser.translator.item.ItemTranslator;
|
||||
import org.geysermc.geyser.util.AttributeUtils;
|
||||
import org.geysermc.geyser.util.InteractionResult;
|
||||
import org.geysermc.geyser.util.MathUtils;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.Attribute;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.AttributeType;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
|
||||
|
@ -252,7 +253,7 @@ public class LivingEntity extends Entity {
|
|||
}
|
||||
|
||||
private void setAttributeScale(float scale) {
|
||||
this.attributeScale = scale;
|
||||
this.attributeScale = MathUtils.clamp(scale, GeyserAttributeType.SCALE.getMinimum(), GeyserAttributeType.SCALE.getMaximum());
|
||||
applyScale();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue