gravity trait: Citizens direct compat

DenizenScript · May 30, 2020 · 9d2ad7f · 9d2ad7f
1 parent cdcb8f7
commit 9d2ad7f
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityGravity.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityGravity.java
@@ -6,6 +6,7 @@
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.properties.Property;
 import com.denizenscript.denizencore.tags.Attribute;
+import net.citizensnpcs.trait.Gravity;
 
 public class EntityGravity implements Property {
 
@@ -67,6 +68,11 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
         // Returns whether the entity has gravity.
         // -->
         if (attribute.startsWith("gravity")) {
+            if (dentity.isCitizensNPC()) {
+                boolean gravityBlocked = dentity.getDenizenNPC().getCitizen().hasTrait(Gravity.class)
+                        && !dentity.getDenizenNPC().getCitizen().getTrait(Gravity.class).hasGravity();
+                return new ElementTag(!gravityBlocked);
+            }
             return new ElementTag(dentity.getBukkitEntity().hasGravity())
                     .getObjectAttribute(attribute.fulfill(1));
         }
@@ -87,7 +93,12 @@ public void adjust(Mechanism mechanism) {
         // <EntityTag.gravity>
         // -->
         if (mechanism.matches("gravity") && mechanism.requireBoolean()) {
-            dentity.getBukkitEntity().setGravity(mechanism.getValue().asBoolean());
+            if (dentity.isCitizensNPC()) {
+                dentity.getDenizenNPC().getCitizen().getTrait(Gravity.class).gravitate(!mechanism.getValue().asBoolean());
+            }
+            else {
+                dentity.getBukkitEntity().setGravity(mechanism.getValue().asBoolean());
+            }
         }
     }
 }