From 5e5b2dc8c8c243a576a4feb0fe1add7b4125914a Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sat, 24 Oct 2015 15:45:57 +0800
Subject: [PATCH] Fix /npc gravity for players

---
 .../citizensnpcs/npc/entity/EntityHumanNPC.java    |  2 +-
 .../citizensnpcs/npc/entity/HumanController.java   |  2 +-
 src/main/java/net/citizensnpcs/trait/Gravity.java  | 14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
index e8680df94..72e1e63b2 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
@@ -236,7 +236,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         navigation = new PlayerNavigation(this, world);
         NMS.setStepHeight(this, 1); // the default (0) breaks step climbing
 
-        setSkinFlags((byte)0xFF);
+        setSkinFlags((byte) 0xFF);
     }
 
     public boolean isNavigating() {
diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
index 4418d35c4..37caabc54 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
@@ -67,7 +67,7 @@ public class HumanController extends AbstractEntityController {
                 }
             }
         }
-        final String prefixCapture = prefix, suffixCapture = suffix, coloredNameCapture = coloredName;
+        final String prefixCapture = prefix, suffixCapture = suffix;
 
         UUID uuid = npc.getUniqueId();
         if (uuid.version() == 4) { // clear version
diff --git a/src/main/java/net/citizensnpcs/trait/Gravity.java b/src/main/java/net/citizensnpcs/trait/Gravity.java
index f3bb6eeb2..a170a2004 100644
--- a/src/main/java/net/citizensnpcs/trait/Gravity.java
+++ b/src/main/java/net/citizensnpcs/trait/Gravity.java
@@ -1,9 +1,11 @@
 package net.citizensnpcs.trait;
 
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-
-import org.bukkit.util.Vector;
+import net.citizensnpcs.npc.entity.EntityHumanNPC.PlayerNPC;
 
 public class Gravity extends Trait implements Toggleable {
     @Persist
@@ -19,7 +21,13 @@ public class Gravity extends Trait implements Toggleable {
 
     @Override
     public void run() {
-        if (!npc.isSpawned() || !enabled)
+        if (!npc.isSpawned())
+            return;
+        if (npc.getEntity() instanceof Player) {
+            ((PlayerNPC) npc.getEntity()).setGravityEnabled(!enabled);
+            return;
+        }
+        if (!enabled)
             return;
         Vector vector = npc.getEntity().getVelocity();
         vector.setY(Math.max(0, vector.getY()));