Fixed resetting scale to 1

FancyMcPlugins · Oct 17, 2024 · 59aecc0 · 59aecc0
1 parent ad959b5
commit 59aecc0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java b/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
@@ -281,15 +281,13 @@ public void update(Player player) {
 
         }
 
-        if (data.getScale() != 1) {
-            Holder.Reference<Attribute> scaleAttribute = BuiltInRegistries.ATTRIBUTE.getHolder(new ResourceLocation("generic.scale")).get();
-            AttributeInstance attributeInstance = new AttributeInstance(scaleAttribute, (a) -> {
-            });
-            attributeInstance.setBaseValue(data.getScale());
-
-            ClientboundUpdateAttributesPacket updateAttributesPacket = new ClientboundUpdateAttributesPacket(npc.getId(), List.of(attributeInstance));
-            serverPlayer.connection.send(updateAttributesPacket);
-        }
+        Holder.Reference<Attribute> scaleAttribute = BuiltInRegistries.ATTRIBUTE.getHolder(new ResourceLocation("generic.scale")).get();
+        AttributeInstance attributeInstance = new AttributeInstance(scaleAttribute, (a) -> {
+        });
+        attributeInstance.setBaseValue(data.getScale());
+
+        ClientboundUpdateAttributesPacket updateAttributesPacket = new ClientboundUpdateAttributesPacket(npc.getId(), List.of(attributeInstance));
+        serverPlayer.connection.send(updateAttributesPacket);
     }
 
     @Override

diff --git a/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -293,15 +293,13 @@ public void update(Player player) {
 
         }
 
-        if (data.getScale() != 1) {
-            Holder.Reference<Attribute> scaleAttribute = BuiltInRegistries.ATTRIBUTE.getHolder(ResourceLocation.parse("generic.scale")).get();
-            AttributeInstance attributeInstance = new AttributeInstance(scaleAttribute, (a) -> {
-            });
-            attributeInstance.setBaseValue(data.getScale());
-
-            ClientboundUpdateAttributesPacket updateAttributesPacket = new ClientboundUpdateAttributesPacket(npc.getId(), List.of(attributeInstance));
-            serverPlayer.connection.send(updateAttributesPacket);
-        }
+        Holder.Reference<Attribute> scaleAttribute = BuiltInRegistries.ATTRIBUTE.getHolder(ResourceLocation.parse("generic.scale")).get();
+        AttributeInstance attributeInstance = new AttributeInstance(scaleAttribute, (a) -> {
+        });
+        attributeInstance.setBaseValue(data.getScale());
+
+        ClientboundUpdateAttributesPacket updateAttributesPacket = new ClientboundUpdateAttributesPacket(npc.getId(), List.of(attributeInstance));
+        serverPlayer.connection.send(updateAttributesPacket);
     }
 
     @Override