From ae8b351edae084c2edb4bc4e480366de4ac794d3 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sun, 13 Mar 2016 00:34:17 +0800
Subject: [PATCH] Fix sitting animation by spawning an invisible silverfish

---
 .../net/citizensnpcs/util/PlayerAnimation.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
index 6bd20e1c2..643357327 100644
--- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
+++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
@@ -1,11 +1,14 @@
 package net.citizensnpcs.util;
 
 import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.minecraft.server.v1_9_R1.BlockPosition;
 import net.minecraft.server.v1_9_R1.EntityPlayer;
@@ -56,7 +59,17 @@ public enum PlayerAnimation {
         protected void playAnimation(final EntityPlayer player, int radius) {
             player.getBukkitEntity().setMetadata("citizens.sitting",
                     new FixedMetadataValue(CitizensAPI.getPlugin(), true));
+            final NPC holder = CitizensAPI.getNPCRegistry().createNPC(EntityType.SILVERFISH, "");
+            holder.spawn(player.getBukkitEntity().getLocation());
+            holder.data().set(NPC.NAMEPLATE_VISIBLE_METADATA, false);
+            holder.data().set(NPC.DEFAULT_PROTECTED_METADATA, true);
             new BukkitRunnable() {
+                @Override
+                public void cancel() {
+                    super.cancel();
+                    holder.destroy();
+                }
+
                 @Override
                 public void run() {
                     if (player.dead || !player.valid
@@ -68,8 +81,9 @@ public enum PlayerAnimation {
                         cancel();
                         return;
                     }
-                    if (!player.passengers.contains(player)) {
-                        NMS.mount(player.getBukkitEntity(), player.getBukkitEntity());
+                    NMS.getHandle((LivingEntity) holder.getEntity()).setInvisible(true);
+                    if (!NMS.getHandle(holder.getEntity()).passengers.contains(player)) {
+                        NMS.mount(holder.getEntity(), player.getBukkitEntity());
                     }
                 }
             }.runTaskTimer(CitizensAPI.getPlugin(), 0, 1);