Merge pull request #4 from Norus6/master

TheWinABagel · web-flow · commit 0d4fdc05282d · 2025-07-29T20:54:24.000-05:00
Fix: Prevent duplicate attribute modifiers (thank you norus6)
diff --git a/src/main/java/dev/shadowsoffire/placebo/json/RandomAttributeModifier.java b/src/main/java/dev/shadowsoffire/placebo/json/RandomAttributeModifier.java
@@ -56,7 +56,13 @@ public void apply(RandomSource rand, LivingEntity entity) {
                     EntityType.getKey(entity.getType()), BuiltInRegistries.ATTRIBUTE.getKey(this.attribute)));
             return;
         }
-        inst.addPermanentModifier(modif);
+        // Check if the modifier already exists before adding it
+        if (inst.getModifier(modif.getId()) == null) {
+            inst.addPermanentModifier(modif);
+        } else {
+            Placebo.LOGGER.warn(String.format("Duplicate attribute modifier detected! Entity: %s, Attribute: %s, Modifier: %s",
+                    EntityType.getKey(entity.getType()), BuiltInRegistries.ATTRIBUTE.getKey(this.attribute), modif.getId()));
+        }
     }
 
     public AttributeModifier create(RandomSource rand) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,13 @@ public void apply(RandomSource rand, LivingEntity entity) {`
`56`	`56`	`EntityType.getKey(entity.getType()), BuiltInRegistries.ATTRIBUTE.getKey(this.attribute)));`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`		`- inst.addPermanentModifier(modif);`
	`59`	`+ // Check if the modifier already exists before adding it`
	`60`	`+ if (inst.getModifier(modif.getId()) == null) {`
	`61`	`+ inst.addPermanentModifier(modif);`
	`62`	`+ } else {`
	`63`	`+ Placebo.LOGGER.warn(String.format("Duplicate attribute modifier detected! Entity: %s, Attribute: %s, Modifier: %s",`
	`64`	`+ EntityType.getKey(entity.getType()), BuiltInRegistries.ATTRIBUTE.getKey(this.attribute), modif.getId()));`
	`65`	`+ }`
`60`	`66`	`}`
`61`	`67`
`62`	`68`	`public AttributeModifier create(RandomSource rand) {`