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

upstream #1

Closed
bridge wants to merge 65 commits from feat/upstream into 2.X
pull from: feat/upstream
merge into: Netherite-Public:2.X
Conversation 0 Commits 65 Files changed 60 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dd8899163c - Show all commits

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

@ -670,8 +670,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
if (!ver.isNewerThanOrEquals(ServerVersion.V_1_20)) return; if (!ver.isNewerThanOrEquals(ServerVersion.V_1_20)) return;
register(new EquipmentProperty(packetFactory, "body", EquipmentSlot.BODY));
// Camel // Camel
int camelIndex = 18; int camelIndex = 18;
register(new BooleanProperty("bashing", camelIndex++, false, legacyBooleans)); register(new BooleanProperty("bashing", camelIndex++, false, legacyBooleans));
@ -690,6 +688,8 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
if (!ver.isNewerThanOrEquals(ServerVersion.V_1_21)) return; if (!ver.isNewerThanOrEquals(ServerVersion.V_1_21)) return;
register(new EquipmentProperty(packetFactory, "body", EquipmentSlot.BODY));
// Bogged // Bogged
register(new BooleanProperty("bogged_sheared", 16, false, legacyBooleans)); register(new BooleanProperty("bogged_sheared", 16, false, legacyBooleans));