Some More Fixes to Rendering, etc

This commit is contained in:
Kam committed 2025-02-12 04:06:25 -05:00
1 parent cb206348c5
commit d6c70167bf
6 files changed
+16 -11

No files matched your search

@@ -304,13 +304,11 @@ public class CustomEffectController implements ICustomEffectHandler {
customEffect.setID(getUnusedId());
while (has(customEffect.getName()))
customEffect.setName(customEffect.getName() + "_");
} else {
CustomEffect existing = getCustomEffects().get(customEffect.getID());
if (existing != null && !existing.name.equalsIgnoreCase(customEffect.getName()))
while (has(customEffect.getName()))
customEffect.setName(customEffect.getName() + "_");
}
while (hasOther(customEffect.getName(), customEffect.getID()))
customEffect.setName(customEffect.getName() + "_");
getCustomEffects().remove(customEffect.getID());
getCustomEffects().put(customEffect.getID(), (CustomEffect) customEffect);
@@ -337,6 +335,14 @@ public class CustomEffectController implements ICustomEffectHandler {
return getCustomEffects().get(customEffect.getID());
}
private boolean hasOther(String name, int id) {
for (CustomEffect effect : getCustomEffects().values()) {
if (effect.getID() != id && effect.getName().equalsIgnoreCase(name))
return true;
}
return false;
}
public void clearEffects(EntityPlayer player) {
Map<EffectKey, PlayerEffect> effects = getPlayerEffects(player);
if (effects != null) {