From 0b4e3cd364820f28a1af9f55fe05a15dc2c2d0e4 Mon Sep 17 00:00:00 2001
From: D3v1s0m <49519439+D3v1s0m@users.noreply.github.com>
Date: Fri, 23 Jun 2023 11:27:55 +0530
Subject: [PATCH] Fixed shaking property not disabling

---
 .../main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java | 2 +-
 .../java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java | 4 ++--
 .../java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java  | 2 +-
 .../java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
index 340f923..1843e23 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
@@ -26,5 +26,5 @@ public interface MetadataFactory {
     Collection<EntityData> name(Component name);
     EntityData noGravity();
     EntityData pose(EntityPose pose);
-    EntityData shaking();
+    EntityData shaking(boolean enabled);
 }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
index 624c02e..137447b 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
@@ -15,7 +15,7 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory {
     }
 
     @Override
-    public EntityData shaking() {
-        return newEntityData(7, EntityDataTypes.INT, 140);
+    public EntityData shaking(boolean enabled) {
+        return newEntityData(7, EntityDataTypes.INT, enabled ? 140 : 0);
     }
 }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
index b41cc24..8b79756 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
@@ -41,7 +41,7 @@ public class V1_8MetadataFactory implements MetadataFactory {
     }
 
     @Override
-    public EntityData shaking() {
+    public EntityData shaking(boolean enabled) {
         throw new UnsupportedOperationException("The shaking entity data isn't supported on this version");
     }
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java
index fc09651..a17ae92 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java
@@ -24,7 +24,7 @@ public class V1_17PacketFactory extends V1_16PacketFactory {
                 properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)),
                 properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)),
                 false));
-        if (properties.getProperty(propertyRegistry.getByName("shaking", Boolean.class))) add(data, metadataFactory.shaking());
+        add(data, metadataFactory.shaking(properties.getProperty(propertyRegistry.getByName("shaking", Boolean.class))));
         return data;
     }
 }