Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

fixed index for horse_armor property and actually added it

Browse source
This commit is contained in:
D3v1s0m 2023-11-08 18:56:42 +05:30
parent 96d30c5a69
commit 75bebd959d
No known key found for this signature in database
GPG key ID: FA1F770C7B1D40C1
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
View file

@ -307,7 +307,12 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
// Use chesteplate property for 1.14 and above
if (ver.isOlderThan(ServerVersion.V_1_14)) {
register(new EncodedIntegerProperty<>("horse_armor", HorseArmor.NONE, horseVariantIndex + 2, Enum::ordinal));
int horseArmorIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_11)) horseArmorIndex = 16;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) horseArmorIndex = 17;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) horseArmorIndex = 16;
else horseArmorIndex = 22;
register(new EncodedIntegerProperty<>("horse_armor", HorseArmor.NONE, horseArmorIndex, Enum::ordinal));
}
// Chested Horse

3
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java
View file

@ -132,6 +132,9 @@ public class NpcTypeImpl implements NpcType {
if (EntityTypes.isTypeInstanceOf(type, EntityTypes.ABSTRACT_HORSE)) {
addProperties("is_saddled", "is_eating", "is_rearing", "has_mouth_open");
}
if (type.equals(EntityTypes.HORSE) && version.isOlderThan(ServerVersion.V_1_14)) {
addProperties("horse_armor");
}
if (EntityTypes.isTypeInstanceOf(type, EntityTypes.CHESTED_HORSE)) {
addProperties("has_chest");
} else if (version.isOlderThan(ServerVersion.V_1_11) && type.equals(EntityTypes.HORSE)) {