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

Add null check, always try process packets after 30 seconds

Browse Source
This commit is contained in:
libraryaddict 2020-09-15 21:58:33 +12:00
parent ebb6d2030d
commit 6de077882c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ public class PlayerSkinHandler implements Listener {
@Getter @Getter
private final Cache<Player, List<PlayerSkin>> cache = private final Cache<Player, List<PlayerSkin>> cache =
CacheBuilder.newBuilder().weakKeys().expireAfterWrite(1, TimeUnit.MINUTES).removalListener((event) -> { CacheBuilder.newBuilder().weakKeys().expireAfterWrite(30, TimeUnit.SECONDS).removalListener((event) -> {
if (event.getCause() != RemovalCause.EXPIRED) { if (event.getCause() != RemovalCause.EXPIRED) {
return; return;
} }
@ -74,6 +74,8 @@ public class PlayerSkinHandler implements Listener {
}).build(); }).build();
public void addPlayerSkin(Player player, PlayerDisguise disguise) { public void addPlayerSkin(Player player, PlayerDisguise disguise) {
tryProcess(player);
List<PlayerSkin> skins = getCache().getIfPresent(player); List<PlayerSkin> skins = getCache().getIfPresent(player);
if (skins == null) { if (skins == null) {
@ -117,6 +119,10 @@ public class PlayerSkinHandler implements Listener {
} }
private void doPacketRemoval(Player player, PlayerDisguise disguise) { private void doPacketRemoval(Player player, PlayerDisguise disguise) {
if (disguise == null) {
return;
}
PacketContainer packetContainer = PacketContainer packetContainer =
DisguiseUtilities.getTabPacket(disguise, EnumWrappers.PlayerInfoAction.REMOVE_PLAYER); DisguiseUtilities.getTabPacket(disguise, EnumWrappers.PlayerInfoAction.REMOVE_PLAYER);
@ -127,9 +133,8 @@ public class PlayerSkinHandler implements Listener {
} }
} }
@EventHandler private void tryProcess(Player player) {
public void onMove(PlayerMoveEvent event) { List<PlayerSkin> skins = getCache().getIfPresent(player);
List<PlayerSkin> skins = getCache().getIfPresent(event.getPlayer());
if (skins == null) { if (skins == null) {
return; return;
@ -148,6 +153,12 @@ public class PlayerSkinHandler implements Listener {
return; return;
} }
getCache().invalidate(event.getPlayer()); getCache().invalidate(player);
}
@EventHandler
public void onMove(PlayerMoveEvent event) {
tryProcess(event.getPlayer());
} }
} }