From 61224e9d796fd7e9253cec9ea4548d48eacf2c94 Mon Sep 17 00:00:00 2001 From: Wealthyturtle Date: Wed, 22 Jul 2020 22:36:30 +0800 Subject: [PATCH] Fix ExprEntityAttribute Parse Bug (#3191) --- .../expressions/ExprEntityAttribute.java | 4 +-- src/main/resources/lang/english.lang | 26 +++++++++---------- src/main/resources/lang/korean.lang | 26 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java index 1d42b05f235..09ab9e88726 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java +++ b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java @@ -54,8 +54,8 @@ public class ExprEntityAttribute extends PropertyExpression { static { Skript.registerExpression(ExprEntityAttribute.class, Number.class, ExpressionType.COMBINED, - "%attributetype% [value] of %entities%", - "%entities%'[s] %attributetype% [value]"); + "%attributetype% attribute [value] of %entities%", + "%entities%'[s] %attributetype% attribute [value]"); } private static final boolean DEFAULTVALUE_EXISTS = Skript.isRunningMinecraft(1, 11); diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang index e7a671ef74b..facb7355423 100644 --- a/src/main/resources/lang/english.lang +++ b/src/main/resources/lang/english.lang @@ -1708,19 +1708,19 @@ genes: # -- Attribute Types -- attribute types: - generic_armor: generic armor, armor attribute - generic_armor_toughness: generic armor toughness, armor toughness attribute - generic_attack_damage: generic attack damage, attack damage attribute - generic_attack_knockback: generic attack knockback, attack knockback attribute - generic_attack_speed: generic attack speed, attack speed attribute - generic_flying_speed: generic flying speed, flying speed attribute - generic_follow_range: generic follow range, follow range attribute - generic_knockback_resistance: generic knockback resistance, knockback resistance attribute - generic_luck: generic luck, luck attribute - generic_max_health: generic max health, max health attribute - generic_movement_speed: generic movement speed, movement speed attribute - horse_jump_strength: horse jump strength, horse jump strength attribute - zombie_spawn_reinforcements: zombie spawn reinforcements, zombie spawn reinforcements attribute + generic_armor: generic armor, armor + generic_armor_toughness: generic armor toughness, armor toughness + generic_attack_damage: generic attack damage, attack damage + generic_attack_knockback: generic attack knockback, attack knockback + generic_attack_speed: generic attack speed, attack speed + generic_flying_speed: generic flying speed, flying speed + generic_follow_range: generic follow range, follow range + generic_knockback_resistance: generic knockback resistance, knockback resistance + generic_luck: generic luck, luck + generic_max_health: generic max health, max health + generic_movement_speed: generic movement speed, movement speed + horse_jump_strength: horse jump strength + zombie_spawn_reinforcements: zombie spawn reinforcements # -- Boolean -- boolean: diff --git a/src/main/resources/lang/korean.lang b/src/main/resources/lang/korean.lang index 44e919c5f9d..3238015bb54 100644 --- a/src/main/resources/lang/korean.lang +++ b/src/main/resources/lang/korean.lang @@ -1715,19 +1715,19 @@ genes: # -- Attribute Types -- attribute types: - generic_armor: generic armor, armor attribute - generic_armor_toughness: generic armor toughness, armor toughness attribute - generic_attack_damage: generic attack damage, attack damage attribute - generic_attack_knockback: generic attack knockback, attack knockback attribute - generic_attack_speed: generic attack speed, attack speed attribute - generic_flying_speed: generic flying speed, flying speed attribute - generic_follow_range: generic follow range, follow range attribute - generic_knockback_resistance: generic knockback resistance, knockback resistance attribute - generic_luck: generic luck, luck attribute - generic_max_health: generic max health, max health attribute - generic_movement_speed: generic movement speed, movement speed attribute - horse_jump_strength: horse jump strength, horse jump strength attribute - zombie_spawn_reinforcements: zombie spawn reinforcements, zombie spawn reinforcements attribute + generic_armor: generic armor, armor + generic_armor_toughness: generic armor toughness, armor toughness + generic_attack_damage: generic attack damage, attack damage + generic_attack_knockback: generic attack knockback, attack knockback + generic_attack_speed: generic attack speed, attack speed + generic_flying_speed: generic flying speed, flying speed + generic_follow_range: generic follow range, follow range + generic_knockback_resistance: generic knockback resistance, knockback resistance + generic_luck: generic luck, luck + generic_max_health: generic max health, max health + generic_movement_speed: generic movement speed, movement speed + horse_jump_strength: horse jump strength + zombie_spawn_reinforcements: zombie spawn reinforcements # -- Boolean -- boolean: