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 +6 -4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 41244fb86b - Show all commits

10
plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/EntitySittingProperty.java
View file

@ -24,10 +24,12 @@ public class EntitySittingProperty extends EntityPropertyImpl<Boolean> {
@Override @Override
public void apply(Player player, PacketEntity entity, boolean isSpawned, Map<Integer, EntityData> properties) { public void apply(Player player, PacketEntity entity, boolean isSpawned, Map<Integer, EntityData> properties) {
boolean sitting = entity.getProperty(this); boolean sitting = entity.getProperty(this);
if (sitting) if (entity.getVehicle() == null) { if (sitting) {
PacketEntity vehiclePacketEntity = new PacketEntity(packetFactory, new ArmorStandVehicleProperties(propertyRegistry), if (entity.getVehicle() == null) {
entity.getViewable(), EntityTypes.ARMOR_STAND, entity.getLocation().withY(entity.getLocation().getY() - 0.9)); PacketEntity vehiclePacketEntity = new PacketEntity(packetFactory, new ArmorStandVehicleProperties(propertyRegistry),
entity.setVehicle(vehiclePacketEntity); entity.getViewable(), EntityTypes.ARMOR_STAND, entity.getLocation().withY(entity.getLocation().getY() - 0.9));
entity.setVehicle(vehiclePacketEntity);
}
} else if (entity.getVehicle() != null) { } else if (entity.getVehicle() != null) {
entity.setVehicle(null); entity.setVehicle(null);
} }