SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try fix a ghost armor issue

Browse Source
This commit is contained in:
libraryaddict
2020-11-03 18:56:58 +13:00
parent 6530408282
commit 9489d794d4
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java
View File

@@ -159,9 +159,7 @@ public class PlayerSkinHandler implements Listener {
}
public void handlePackets(Player player, PlayerDisguise disguise, LibsPackets packets) {
if (packets.getPackets().stream().anyMatch(p -> p.getType() == Server.NAMED_ENTITY_SPAWN)) {
return;
}
boolean spawn = packets.getPackets().stream().anyMatch(p -> p.getType() == Server.NAMED_ENTITY_SPAWN);
List<PlayerSkin> skins = getCache().getIfPresent(player);
@@ -175,6 +173,17 @@ public class PlayerSkinHandler implements Listener {
return;
}
if (spawn) {
packets.getDelayedPacketsMap().entrySet().removeIf(entry -> {
entry.getValue()
.removeIf(packet -> packet.getType() == Server.ENTITY_EQUIPMENT && isRemove(skin, packet));
return entry.getValue().isEmpty();
});
return;
}
packets.getPackets().removeIf(packet -> isRemove(skin, packet));
packets.getDelayedPacketsMap().entrySet().removeIf(entry -> {

2
src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java
View File

@@ -74,6 +74,7 @@ public class PacketHandlerSpawn implements IPacketHandler {
*/
private void constructSpawnPackets(final Player observer, LibsPackets packets, Entity disguisedEntity) {
Disguise disguise = packets.getDisguise();
boolean sendArmor = true;
if (DisguiseConfig.isMiscDisguisesForLivingEnabled()) {
if (disguise.getWatcher() instanceof LivingWatcher) {
@@ -215,6 +216,7 @@ public class PacketHandlerSpawn implements IPacketHandler {
boolean normalPlayerDisguise = observer == disguisedEntity || dist > (50 * 50) ||
(observer.getLocation().add(observer.getLocation().getDirection().normalize())
.distanceSquared(disguisedEntity.getLocation()) - dist) < 0.3;
sendArmor = normalPlayerDisguise;
skin.setSleepPackets(!normalPlayerDisguise);