Fixed bug where gestures could leave you unable to swap your hotbar

plugin/src/main/java/io/lumine/cosmetics/managers/gestures/GestureManager.java

@@ -11,6 +11,8 @@ import io.lumine.cosmetics.managers.MCCosmeticsManager;
 import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
 import io.lumine.utils.Events;
 import io.lumine.utils.files.Files;
+import lombok.Getter;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -21,7 +23,7 @@ import java.util.Map;
 
 public class GestureManager extends MCCosmeticsManager<Gesture> {
 
-	private final Map<Player, CustomPlayerModel> ticking = Maps.newConcurrentMap();
+	@Getter private final Map<Player, CustomPlayerModel> ticking = Maps.newConcurrentMap();
 
 	public GestureManager(MCCosmeticsPlugin plugin) {
 		super(plugin, Gesture.class);

v1_17_R1/src/main/java/io/lumine/cosmetics/nms/v1_17_R1/cosmetic/VolatileGestureImpl.java

@@ -142,20 +142,12 @@ public class VolatileGestureImpl implements VolatileEquipmentHelper {
 
 	@Override
 	public boolean read(Player sender, Object packet, boolean isCanceled) {
-		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
-		if(profile == null)
-			return true;
-		final var maybeEquipped = profile.getEquipped(Gesture.class);
-		if(maybeEquipped.isEmpty()) {
-		    return true;
-		}
-		var opt = maybeEquipped.get().getCosmetic();
-		
-		if(!(opt instanceof Gesture gesture))
-			return true;
+        if(!plugin.getGestureManager().getTicking().containsKey(sender)) {
+            return true;
+        }
 
 		if(packet instanceof ServerboundPlayerInputPacket inputPacket) {
-			final var manager = (GestureManager) gesture.getManager();
+			final var manager = (GestureManager) plugin.getGestureManager();
 			if(inputPacket.isShiftKeyDown())
 				manager.quit(sender, QuitMethod.SNEAK);
 			if(inputPacket.isJumping())

v1_18_R1/src/main/java/io/lumine/cosmetics/nms/v1_18_R1/cosmetic/VolatileGestureImpl.java

@@ -142,20 +142,12 @@ public class VolatileGestureImpl implements VolatileEquipmentHelper {
 
 	@Override
 	public boolean read(Player sender, Object packet, boolean isCanceled) {
-		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
-		if(profile == null)
-			return true;
-		final var maybeEquipped = profile.getEquipped(Gesture.class);
-		if(maybeEquipped.isEmpty()) {
-		    return true;
-		}
-		var opt = maybeEquipped.get().getCosmetic();
-		
-		if(!(opt instanceof Gesture gesture))
-			return true;
+        if(!plugin.getGestureManager().getTicking().containsKey(sender)) {
+            return true;
+        }
 
 		if(packet instanceof ServerboundPlayerInputPacket inputPacket) {
-			final var manager = (GestureManager) gesture.getManager();
+			final var manager = (GestureManager) plugin.getGestureManager();
 			if(inputPacket.isShiftKeyDown())
 				manager.quit(sender, QuitMethod.SNEAK);
 			if(inputPacket.isJumping())

v1_18_R2/src/main/java/io/lumine/cosmetics/nms/v1_18_R2/cosmetic/VolatileGestureImpl.java

@@ -142,20 +142,12 @@ public class VolatileGestureImpl implements VolatileEquipmentHelper {
 
 	@Override
 	public boolean read(Player sender, Object packet, boolean isCanceled) {
-		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
-		if(profile == null)
-			return true;
-		final var maybeEquipped = profile.getEquipped(Gesture.class);
-		if(maybeEquipped.isEmpty()) {
-		    return true;
-		}
-		var opt = maybeEquipped.get().getCosmetic();
-		
-		if(!(opt instanceof Gesture gesture))
-			return true;
+        if(!plugin.getGestureManager().getTicking().containsKey(sender)) {
+            return true;
+        }
 
 		if(packet instanceof ServerboundPlayerInputPacket inputPacket) {
-			final var manager = (GestureManager) gesture.getManager();
+			final var manager = (GestureManager) plugin.getGestureManager();
 			if(inputPacket.isShiftKeyDown())
 				manager.quit(sender, QuitMethod.SNEAK);
 			if(inputPacket.isJumping())

v1_19_R1/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/cosmetic/VolatileGestureImpl.java

@@ -142,20 +142,12 @@ public class VolatileGestureImpl implements VolatileEquipmentHelper {
 
 	@Override
 	public boolean read(Player sender, Object packet, boolean isCanceled) {
-		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
-		if(profile == null)
-			return true;
-		final var maybeEquipped = profile.getEquipped(Gesture.class);
-		if(maybeEquipped.isEmpty()) {
-		    return true;
-		}
-		var opt = maybeEquipped.get().getCosmetic();
-		
-		if(!(opt instanceof Gesture gesture))
-			return true;
+        if(!plugin.getGestureManager().getTicking().containsKey(sender)) {
+            return true;
+        }
 
 		if(packet instanceof ServerboundPlayerInputPacket inputPacket) {
-			final var manager = (GestureManager) gesture.getManager();
+			final var manager = (GestureManager) plugin.getGestureManager();
 			if(inputPacket.isShiftKeyDown())
 				manager.quit(sender, QuitMethod.SNEAK);
 			if(inputPacket.isJumping())

v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileGestureImpl.java

@@ -142,20 +142,12 @@ public class VolatileGestureImpl implements VolatileEquipmentHelper {
 
 	@Override
 	public boolean read(Player sender, Object packet, boolean isCanceled) {
-		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
-		if(profile == null)
-			return true;
-		final var maybeEquipped = profile.getEquipped(Gesture.class);
-		if(maybeEquipped.isEmpty()) {
+		if(!plugin.getGestureManager().getTicking().containsKey(sender)) {
 		    return true;
 		}
-		var opt = maybeEquipped.get().getCosmetic();
-		
-		if(!(opt instanceof Gesture gesture))
-			return true;
 
 		if(packet instanceof ServerboundPlayerInputPacket inputPacket) {
-			final var manager = (GestureManager) gesture.getManager();
+			final var manager = (GestureManager) plugin.getGestureManager();
 			if(inputPacket.isShiftKeyDown())
 				manager.quit(sender, QuitMethod.SNEAK);
 			if(inputPacket.isJumping())

v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileHatImpl.java

@@ -140,7 +140,7 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
     }
 
     public void handleSpawn(Profile profile) {
-
+        
         final var maybeEquipped = profile.getEquipped(Hat.class);
         if(maybeEquipped.isEmpty()) {
             return;