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

make npcs always have teams

Browse source
This commit is contained in:
Pyrbu 2023-05-03 16:43:16 +01:00
parent bdbbd0bef9
commit 1f5bea5f8e
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java
View file

@ -51,12 +51,13 @@ public class V1_8Factory implements PacketFactory {
new WrapperPlayServerSpawnEntity(entity.getEntityId(), Optional.of(entity.getUuid()), entity.getType(), location.toVector3d(), new WrapperPlayServerSpawnEntity(entity.getEntityId(), Optional.of(entity.getUuid()), entity.getType(), location.toVector3d(),
location.getPitch(), location.getYaw(), location.getYaw(), 0, Optional.empty())); location.getPitch(), location.getYaw(), location.getYaw(), 0, Optional.empty()));
sendAllMetadata(player, entity, properties); sendAllMetadata(player, entity, properties);
createTeam(player, entity, properties);
} }
@Override @Override
public void destroyEntity(Player player, PacketEntity entity, PropertyHolder properties) { public void destroyEntity(Player player, PacketEntity entity, PropertyHolder properties) {
sendPacket(player, new WrapperPlayServerDestroyEntities(entity.getEntityId())); sendPacket(player, new WrapperPlayServerDestroyEntities(entity.getEntityId()));
if (entity.getType() == EntityTypes.PLAYER) removeTeam(player, entity); removeTeam(player, entity);
} }
@Override @Override

12
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9Factory.java
View file

@ -23,16 +23,4 @@ public class V1_9Factory extends V1_8Factory {
if (properties.hasProperty(EntityProperty.NAME)) data.addAll(MetadataFactory.get().name(properties.getProperty(EntityProperty.NAME))); if (properties.hasProperty(EntityProperty.NAME)) data.addAll(MetadataFactory.get().name(properties.getProperty(EntityProperty.NAME)));
sendMetadata(player, entity, data); sendMetadata(player, entity, data);
} }
@Override
public void spawnEntity(Player player, PacketEntity entity, PropertyHolder properties) {
super.spawnEntity(player, entity, properties);
if (properties.hasProperty(EntityProperty.GLOW)) createTeam(player, entity, properties);
}
@Override
public void destroyEntity(Player player, PacketEntity entity, PropertyHolder properties) {
super.destroyEntity(player, entity, properties);
if (entity.getType() != EntityTypes.PLAYER && properties.hasProperty(EntityProperty.GLOW)) removeTeam(player, entity);
}
} }