yupituasf

api/src/main/java/io/lumine/cosmetics/api/cosmetics/Cosmetic.java

 package io.lumine.cosmetics.api.cosmetics;
 
+import io.lumine.cosmetics.api.cosmetics.manager.CosmeticManager;
 import io.lumine.cosmetics.api.players.CosmeticInventory;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
 import io.lumine.utils.config.properties.PropertyHolder;

api/src/main/java/io/lumine/cosmetics/api/cosmetics/CosmeticManager.java → api/src/main/java/io/lumine/cosmetics/api/cosmetics/manager/CosmeticManager.java

-package io.lumine.cosmetics.api.cosmetics;
-
-import io.lumine.cosmetics.api.players.CosmeticProfile;
-
-public interface CosmeticManager {
-
-    void equip(CosmeticProfile profile);
-    void unequip(CosmeticProfile profile);
-    
-}
+package io.lumine.cosmetics.api.cosmetics.manager;
+
+import io.lumine.cosmetics.api.players.CosmeticProfile;
+
+public interface CosmeticManager {
+
+    void equip(CosmeticProfile profile);
+    void unequip(CosmeticProfile profile);
+    
+}

api/src/main/java/io/lumine/cosmetics/api/cosmetics/manager/HideableCosmetic.java

+package io.lumine.cosmetics.api.cosmetics.manager;
+
+import io.lumine.cosmetics.api.cosmetics.Cosmetic;
+import io.lumine.cosmetics.api.players.CosmeticProfile;
+
+public interface HideableCosmetic {
+
+	void hide(CosmeticProfile profile, Cosmetic request);
+	void show(CosmeticProfile profile);
+
+}

api/src/main/java/io/lumine/cosmetics/api/players/CosmeticInventory.java

@@ -3,6 +3,7 @@ package io.lumine.cosmetics.api.players;
 import io.lumine.cosmetics.api.cosmetics.Cosmetic;
 
 import java.util.Collection;
+import java.util.Map;
 import java.util.Optional;
 
 public interface CosmeticInventory {
@@ -12,6 +13,8 @@ public interface CosmeticInventory {
     Collection<String> getUnlocked(String type);
 
     Optional<Cosmetic> getEquipped(Class<? extends Cosmetic> tClass);
+
+    Map<Class<? extends Cosmetic>, Cosmetic> getEquipped();
     
     void equip(Cosmetic cosmetic);
 

plugin/src/main/java/io/lumine/cosmetics/managers/MCCosmeticsManager.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import io.lumine.cosmetics.MCCosmeticsPlugin;
 import io.lumine.cosmetics.api.cosmetics.Cosmetic;
-import io.lumine.cosmetics.api.cosmetics.CosmeticManager;
+import io.lumine.cosmetics.api.cosmetics.manager.CosmeticManager;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
 import io.lumine.cosmetics.config.Scope;
 import io.lumine.cosmetics.constants.CosmeticType;

plugin/src/main/java/io/lumine/cosmetics/managers/back/BackManager.java

 package io.lumine.cosmetics.managers.back;
 
 import io.lumine.cosmetics.MCCosmeticsPlugin;
-import io.lumine.cosmetics.api.events.CosmeticPlayerLoadedEvent;
+import io.lumine.cosmetics.api.cosmetics.Cosmetic;
+import io.lumine.cosmetics.api.cosmetics.manager.HideableCosmetic;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
 import io.lumine.cosmetics.managers.MCCosmeticsManager;
+import io.lumine.cosmetics.managers.gestures.Gesture;
 import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
-import io.lumine.utils.Events;
 
 import java.io.File;
 
-public class BackManager extends MCCosmeticsManager<BackAccessory> {
+public class BackManager extends MCCosmeticsManager<BackAccessory> implements HideableCosmetic {
 
     public BackManager(MCCosmeticsPlugin plugin) {
         super(plugin, BackAccessory.class);
@@ -24,11 +25,28 @@ public class BackManager extends MCCosmeticsManager<BackAccessory> {
 
     @Override
     public void equip(CosmeticProfile profile) {
-        ((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(BackAccessory.class)).apply(profile);
+        getHelper().apply(profile);
     }
 
     @Override
     public void unequip(CosmeticProfile profile) {
-        ((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(BackAccessory.class)).unapply(profile);
+        getHelper().unapply(profile);
     }
+
+    @Override
+    public void hide(CosmeticProfile profile, Cosmetic request) {
+        if(!(request instanceof Gesture))
+            return;
+        getHelper().unapply(profile);
+    }
+
+    @Override
+    public void show(CosmeticProfile profile) {
+        getHelper().apply(profile);
+    }
+
+    protected VolatileEquipmentHelper getHelper() {
+        return (VolatileEquipmentHelper) getNMSHelper();
+    }
+
 }

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

@@ -25,14 +25,12 @@ public class Gesture extends AbstractCosmetic {
 	private static final StringProp SLIM = Property.String(Scope.NONE, "Slim");
 	private static final BooleanProp CAN_MOVE = Property.Boolean(Scope.NONE, "CanMove", false);
 	private static final BooleanProp CAN_LOOK = Property.Boolean(Scope.NONE, "CanLook", false);
-	private static final BooleanProp FORCE_LOOP = Property.Boolean(Scope.NONE, "CanLook", false);
 	private static final EnumProp<QuitMethod> QUIT_CONTROL = Property.Enum(Scope.NONE, QuitMethod.class,"QuitControl", QuitMethod.SNEAK);
 
 	@Getter private final String defaultGesture;
 	@Getter private final String slimGesture;
 	@Getter private final boolean canMove;
 	@Getter private final boolean canLook;
-	@Getter private final boolean forceLoop;
 	@Getter private final QuitMethod quitMethod;
 
 	public Gesture(GestureManager manager, File file, String key) {
@@ -47,7 +45,6 @@ public class Gesture extends AbstractCosmetic {
 
 		canMove = CAN_MOVE.fget(file, this);
 		canLook = CAN_LOOK.fget(file, this);
-		forceLoop = FORCE_LOOP.fget(file, this);
 		quitMethod = QUIT_CONTROL.fget(file, this);
 	}
 

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

@@ -8,6 +8,7 @@ import io.lumine.cosmetics.MCCosmeticsPlugin;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
 import io.lumine.cosmetics.constants.CosmeticType;
 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 org.bukkit.entity.Player;
@@ -63,11 +64,14 @@ public class GestureManager extends MCCosmeticsManager<Gesture> {
 		ticking.put(player, model);
 		final var animation = model.getTexture().isSlim() ? gesture.getSlimGesture() : gesture.getDefaultGesture();
 		model.playAnimation(animation);
+
+		((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(Gesture.class)).apply(profile);
 	}
 
 	@Override
 	public void unequip(CosmeticProfile profile) {
 		ticking.remove(profile.getPlayer());
+		((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(Gesture.class)).unapply(profile);
 	}
 
 	private void loadGestures() {

plugin/src/main/java/io/lumine/cosmetics/managers/hats/HatManager.java

 package io.lumine.cosmetics.managers.hats;
 
 import io.lumine.cosmetics.MCCosmeticsPlugin;
-import io.lumine.cosmetics.api.events.CosmeticPlayerLoadedEvent;
+import io.lumine.cosmetics.api.cosmetics.Cosmetic;
+import io.lumine.cosmetics.api.cosmetics.manager.HideableCosmetic;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
 import io.lumine.cosmetics.managers.MCCosmeticsManager;
+import io.lumine.cosmetics.managers.gestures.Gesture;
 import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
 import io.lumine.cosmetics.players.Profile;
 import io.lumine.utils.Events;
 import io.lumine.utils.events.extra.ArmorEquipEvent; 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
 
 import java.io.File;
-import java.util.logging.Level;
 
-public class HatManager extends MCCosmeticsManager<Hat> {
+public class HatManager extends MCCosmeticsManager<Hat> implements HideableCosmetic {
     
     public HatManager(MCCosmeticsPlugin plugin) {
         super(plugin, Hat.class);   
@@ -58,11 +58,27 @@ public class HatManager extends MCCosmeticsManager<Hat> {
 
     @Override
     public void equip(CosmeticProfile profile) {
-        ((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(Hat.class)).apply(profile);
+        getHelper().apply(profile);
     }
 
     @Override
     public void unequip(CosmeticProfile profile) {
-        ((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(Hat.class)).unapply(profile);
+        getHelper().unapply(profile);
+    }
+
+    @Override
+    public void hide(CosmeticProfile profile, Cosmetic request) {
+        if(!(request instanceof Gesture))
+            return;
+        getHelper().unapply(profile);
+    }
+
+    @Override
+    public void show(CosmeticProfile profile) {
+        getHelper().apply(profile);
+    }
+
+    protected VolatileEquipmentHelper getHelper() {
+        return (VolatileEquipmentHelper) getNMSHelper();
     }
 }

plugin/src/main/java/io/lumine/cosmetics/managers/offhand/OffhandManager.java

 package io.lumine.cosmetics.managers.offhand;
 
 import io.lumine.cosmetics.MCCosmeticsPlugin;
-import io.lumine.cosmetics.api.events.CosmeticPlayerLoadedEvent;
+import io.lumine.cosmetics.api.cosmetics.Cosmetic;
+import io.lumine.cosmetics.api.cosmetics.manager.HideableCosmetic;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
 import io.lumine.cosmetics.managers.MCCosmeticsManager;
+import io.lumine.cosmetics.managers.gestures.Gesture;
 import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
 import io.lumine.cosmetics.players.Profile;
 import io.lumine.utils.Events;
-import io.lumine.utils.events.extra.ArmorEquipEvent;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@@ -15,7 +16,7 @@ import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
 import java.io.File;
 
-public class OffhandManager extends MCCosmeticsManager<Offhand> {
+public class OffhandManager extends MCCosmeticsManager<Offhand> implements HideableCosmetic {
     
     public OffhandManager(MCCosmeticsPlugin plugin) {
         super(plugin, Offhand.class);
@@ -69,11 +70,27 @@ public class OffhandManager extends MCCosmeticsManager<Offhand> {
 
     @Override
     public void equip(CosmeticProfile profile) {
-        ((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(Offhand.class)).apply(profile);
+        getHelper().apply(profile);
     }
 
     @Override
     public void unequip(CosmeticProfile profile) {
-        ((VolatileEquipmentHelper) getPlugin().getVolatileCodeHandler().getCosmeticHelper(Offhand.class)).unapply(profile);
+        getHelper().unapply(profile);
+    }
+
+    @Override
+    public void hide(CosmeticProfile profile, Cosmetic request) {
+        if(!(request instanceof Gesture))
+            return;
+        getHelper().unapply(profile);
+    }
+
+    @Override
+    public void show(CosmeticProfile profile) {
+        getHelper().apply(profile);
+    }
+
+    protected VolatileEquipmentHelper getHelper() {
+        return (VolatileEquipmentHelper) getNMSHelper();
     }
 }

plugin/src/main/java/io/lumine/cosmetics/players/ProfileInventory.java

@@ -22,7 +22,7 @@ public class ProfileInventory implements CosmeticInventory {
 
     @Getter private transient CosmeticProfile profile;
 
-    private transient final Map<Class<? extends Cosmetic>, Cosmetic> equipped = Maps.newConcurrentMap();
+    @Getter private transient final Map<Class<? extends Cosmetic>, Cosmetic> equipped = Maps.newConcurrentMap();
     @Getter private final Map<String,List<String>> unlockedCosmetics = Maps.newConcurrentMap();
     @Getter private final Map<String,String> equippedCosmetics = Maps.newConcurrentMap();
     

v1_18_R2/src/main/java/io/lumine/cosmetics/nms/VolatileCodeEnabled_v1_18_R2.java

@@ -4,14 +4,12 @@ import com.google.common.collect.Maps;
 import io.lumine.cosmetics.MCCosmeticsPlugin;
 import io.lumine.cosmetics.api.cosmetics.Cosmetic;
 import io.lumine.cosmetics.managers.back.BackAccessory;
+import io.lumine.cosmetics.managers.gestures.Gesture;
 import io.lumine.cosmetics.managers.hats.Hat;
 import io.lumine.cosmetics.managers.offhand.Offhand;
 import io.lumine.cosmetics.managers.sprays.Spray;
 import io.lumine.cosmetics.nms.cosmetic.VolatileCosmeticHelper;
-import io.lumine.cosmetics.nms.v1_18_R2.cosmetic.VolatileBackImpl;
-import io.lumine.cosmetics.nms.v1_18_R2.cosmetic.VolatileHatImpl;
-import io.lumine.cosmetics.nms.v1_18_R2.cosmetic.VolatileOffhandImpl;
-import io.lumine.cosmetics.nms.v1_18_R2.cosmetic.VolatileSprayImpl;
+import io.lumine.cosmetics.nms.v1_18_R2.cosmetic.*;
 import io.lumine.cosmetics.nms.v1_18_R2.network.VolatileChannelHandler;
 import io.lumine.utils.reflection.Reflector;
 import io.netty.channel.Channel;
@@ -25,7 +23,6 @@ import net.minecraft.world.level.entity.PersistentEntitySectionManager;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
@@ -48,6 +45,7 @@ public class VolatileCodeEnabled_v1_18_R2 implements VolatileCodeHandler {
         cosmeticHelpers.put(BackAccessory.class, new VolatileBackImpl(plugin, this));
         cosmeticHelpers.put(Spray.class, new VolatileSprayImpl(plugin, this));
         cosmeticHelpers.put(Offhand.class, new VolatileOffhandImpl(plugin, this));
+        cosmeticHelpers.put(Gesture.class, new VolatileGestureImpl(plugin, this));
     }
 
     @Override
@@ -99,7 +97,7 @@ public class VolatileCodeEnabled_v1_18_R2 implements VolatileCodeHandler {
         }
     }
 
-    public void broadcastAround(Player wearer, Packet<?>... packets) {
+    public void broadcastAroundAndSelf(Player wearer, Packet<?>... packets) {
         final var level = ((CraftWorld) wearer.getWorld()).getHandle();
         final var trackedEntity = level.getChunkSource().chunkMap.entityMap.get(wearer.getEntityId());
 
@@ -112,6 +110,19 @@ public class VolatileCodeEnabled_v1_18_R2 implements VolatileCodeHandler {
             trackedEntity.broadcastAndSend(packet);
     }
 
+    public void broadcastAround(Player wearer, Packet<?>... packets) {
+        final var level = ((CraftWorld) wearer.getWorld()).getHandle();
+        final var trackedEntity = level.getChunkSource().chunkMap.entityMap.get(wearer.getEntityId());
+
+        if(trackedEntity == null) {
+            broadcast(wearer.getWorld(), packets);
+            return;
+        }
+
+        for(Packet<?> packet : packets)
+            trackedEntity.broadcast(packet);
+    }
+
     public void broadcast(World world, Packet<?>... packets) {
         for(Player player : world.getPlayers()) {
             var connection = ((CraftPlayer) player).getHandle().connection;

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

@@ -26,7 +26,6 @@ import org.bukkit.entity.Player;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.logging.Level;
 
 public class VolatileBackImpl implements VolatileEquipmentHelper {
 
@@ -67,14 +66,14 @@ public class VolatileBackImpl implements VolatileEquipmentHelper {
 			ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(stand.getId(), stand.getEntityData(), true);
 			ClientboundSetPassengersPacket passengersPacket = createPassengerPacket(player.getEntityId(), stand.getId());
 
-			nmsHandler.broadcastAround(player, mobPacket, dataPacket, passengersPacket);
+			nmsHandler.broadcastAroundAndSelf(player, mobPacket, dataPacket, passengersPacket);
 		}
 
 		stand.setItemSlot(EquipmentSlot.HEAD, nmsBack);
 
 		ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(stand.getId(), List.of(Pair.of(EquipmentSlot.HEAD, nmsBack)));
 
-		nmsHandler.broadcastAround(player, equipmentPacket);
+		nmsHandler.broadcastAroundAndSelf(player, equipmentPacket);
 	}
 
 	@Override
@@ -84,16 +83,16 @@ public class VolatileBackImpl implements VolatileEquipmentHelper {
 		if(stand == null)
 			return;
 		ClientboundRemoveEntitiesPacket removePacket = new ClientboundRemoveEntitiesPacket(stand.getId());
-		nmsHandler.broadcastAround(player, removePacket);
+		nmsHandler.broadcastAroundAndSelf(player, removePacket);
 	}
 
 	@Override
 	public void read(Player sender, Object packet) {
+		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
+
 		if(packet instanceof ServerboundMovePlayerPacket) {
-			final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
 			handleRotate(profile);
 		}else if(packet instanceof ServerboundAcceptTeleportationPacket) {
-			final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
 			final var list = handleSpawn(profile);
 			if(list == null)
 				return;
@@ -133,7 +132,7 @@ public class VolatileBackImpl implements VolatileEquipmentHelper {
 		final var stand = activeProfile.get(wearer);
 
 		ClientboundRotateHeadPacket packet = new ClientboundRotateHeadPacket(stand, VolatileEquipmentHelper.toByte(nmsPlayer.getYRot()));
-		nmsHandler.broadcastAround(wearer, packet);
+		nmsHandler.broadcastAroundAndSelf(wearer, packet);
 	}
 
 	private List<Object> handleSpawn(Profile profile) {

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

+package io.lumine.cosmetics.nms.v1_18_R2.cosmetic;
+
+import com.google.common.collect.Sets;
+import com.mojang.datafixers.util.Pair;
+import io.lumine.cosmetics.MCCosmeticsPlugin;
+import io.lumine.cosmetics.api.cosmetics.Cosmetic;
+import io.lumine.cosmetics.api.cosmetics.manager.HideableCosmetic;
+import io.lumine.cosmetics.api.players.CosmeticProfile;
+import io.lumine.cosmetics.managers.gestures.Gesture;
+import io.lumine.cosmetics.managers.gestures.GestureManager;
+import io.lumine.cosmetics.managers.gestures.QuitMethod;
+import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_18_R2;
+import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
+import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.animal.horse.Horse;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.attribute.CraftAttributeMap;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public class VolatileGestureImpl implements VolatileEquipmentHelper {
+
+	private static final List<Pair<EquipmentSlot, ItemStack>> empty = new ArrayList<>();
+
+	static {
+		for(final var slot : EquipmentSlot.values())
+			empty.add(Pair.of(slot, ItemStack.EMPTY));
+	}
+
+	@Getter
+	private final MCCosmeticsPlugin plugin;
+	private final VolatileCodeEnabled_v1_18_R2 nmsHandler;
+	private final Set<Player> activeProfile = Sets.newConcurrentHashSet();
+
+	private Horse horse;
+
+	public VolatileGestureImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_18_R2 nmsHandler) {
+		this.plugin = plugin;
+		this.nmsHandler = nmsHandler;
+	}
+
+	@Override
+	public void apply(CosmeticProfile profile) {
+		if (profile == null)
+			return;
+		Player player = profile.getPlayer();
+		if(activeProfile.contains(player))
+			return;
+
+		Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquipped(Gesture.class);
+		if (cosmetic.isEmpty() || !(cosmetic.get() instanceof Gesture gesture))
+			return;
+
+		getHorsed(player);
+		player.setInvisible(true);
+		for(final var value : profile.getCosmeticInventory().getEquipped().values()) {
+			final var manager = value.getManager();
+			if(!(manager instanceof HideableCosmetic hide))
+				continue;
+			hide.hide(profile, gesture);
+		}
+	}
+
+	@Override
+	public void unapply(CosmeticProfile profile) {
+		if (profile == null)
+			return;
+		Player player = profile.getPlayer();
+		if(!activeProfile.contains(player))
+			return;
+
+		activeProfile.remove(player);
+		nmsHandler.broadcast(player, new ClientboundRemoveEntitiesPacket(horse.getId()));
+
+		player.setInvisible(false);
+		for(final var value : profile.getCosmeticInventory().getEquipped().values()) {
+			final var manager = value.getManager();
+			if(!(manager instanceof HideableCosmetic hide))
+				continue;
+			hide.show(profile);
+		}
+	}
+
+	private ClientboundSetPassengersPacket createPassengerPacket(int mount, int... driver) {
+		FriendlyByteBuf bb = new FriendlyByteBuf(Unpooled.buffer());
+		bb.writeVarInt(mount);
+		bb.writeVarIntArray(driver);
+		return new ClientboundSetPassengersPacket(bb);
+	}
+
+	private void getHorsed(Player player) {
+		final var nmsPlayer = ((CraftPlayer) player).getHandle();
+
+		if(horse == null) {
+			horse = new Horse(EntityType.HORSE, ((CraftWorld) player.getWorld()).getHandle());
+			horse.setInvisible(true);
+			horse.setHealth(0);
+			horse.getAttribute(CraftAttributeMap.toMinecraft(Attribute.GENERIC_MAX_HEALTH)).setBaseValue(0);
+		}
+		horse.setPos(nmsPlayer.getX(), nmsPlayer.getY() - horse.getPassengersRidingOffset() - nmsPlayer.getMyRidingOffset(), nmsPlayer.getZ());
+
+		activeProfile.add(player);
+
+		ClientboundAddMobPacket mobPacket = new ClientboundAddMobPacket(horse);
+		ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(horse.getId(), horse.getEntityData(), true);
+		ClientboundUpdateAttributesPacket attributesPacket = new ClientboundUpdateAttributesPacket(horse.getId(), horse.getAttributes().getSyncableAttributes());
+		ClientboundSetPassengersPacket passengersPacket = createPassengerPacket(horse.getId(), nmsPlayer.getId());
+
+		nmsHandler.broadcast(player, mobPacket, dataPacket, attributesPacket, passengersPacket);
+	}
+
+	@Override
+	public void read(Player sender, Object packet) {
+		final var profile = MCCosmeticsPlugin.inst().getProfiles().getProfile(sender);
+		if(profile == null)
+			return;
+		final var opt = profile.getCosmeticInventory().getEquipped(Gesture.class);
+		if(opt.isEmpty() || !(opt.get() instanceof Gesture gesture))
+			return;
+
+		if(packet instanceof ServerboundPlayerInputPacket inputPacket) {
+			final var manager = (GestureManager) gesture.getManager();
+			if(inputPacket.isShiftKeyDown())
+				manager.quit(sender, QuitMethod.SNEAK);
+			if(inputPacket.isJumping())
+				manager.quit(sender, QuitMethod.JUMP);
+		}
+	}
+}

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

@@ -52,7 +52,7 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
 
         ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(player.getEntityId(), List.of(Pair.of(EquipmentSlot.HEAD, nmsHat)));
 
-        nmsHandler.broadcastAround(player, equipmentPacket);
+        nmsHandler.broadcastAroundAndSelf(player, equipmentPacket);
 
     }
 
@@ -60,10 +60,8 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
     public void unapply(CosmeticProfile profile) {
         final var nmsPlayer = ((CraftPlayer) profile.getPlayer()).getHandle();
         final var item = nmsPlayer.getItemBySlot(EquipmentSlot.HEAD);
-        if(item == ItemStack.EMPTY)
-            return;
         ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(nmsPlayer.getId(), List.of(Pair.of(EquipmentSlot.HEAD, item)));
-        nmsHandler.broadcastAround(nmsPlayer.getBukkitEntity(), equipmentPacket);
+        nmsHandler.broadcastAroundAndSelf(nmsPlayer.getBukkitEntity(), equipmentPacket);
     }
 
     @Override

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

@@ -53,7 +53,7 @@ public class VolatileOffhandImpl implements VolatileEquipmentHelper {
 
         ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(player.getEntityId(), List.of(Pair.of(EquipmentSlot.OFFHAND, nmsOffhand)));
 
-        nmsHandler.broadcastAround(player, equipmentPacket);
+        nmsHandler.broadcastAroundAndSelf(player, equipmentPacket);
 
     }
 
@@ -61,10 +61,8 @@ public class VolatileOffhandImpl implements VolatileEquipmentHelper {
     public void unapply(CosmeticProfile profile) {
         final var nmsPlayer = ((CraftPlayer) profile.getPlayer()).getHandle();
         final var item = nmsPlayer.getItemBySlot(EquipmentSlot.OFFHAND);
-        if(item == ItemStack.EMPTY)
-            return;
         ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(nmsPlayer.getId(), List.of(Pair.of(EquipmentSlot.OFFHAND, item)));
-        nmsHandler.broadcastAround(nmsPlayer.getBukkitEntity(), equipmentPacket);
+        nmsHandler.broadcastAroundAndSelf(nmsPlayer.getBukkitEntity(), equipmentPacket);
     }
 
     @Override