Stop requiring the config to have self disguise scaling enabled, for disguises to scale

This commit is contained in:
libraryaddict 2025-01-05 23:55:35 +13:00
parent 428c96398a
commit 61539b5280

View File

@ -543,7 +543,7 @@ public abstract class Disguise {
} }
public void setScalePlayerToDisguise(boolean scalePlayerToDisguise) { public void setScalePlayerToDisguise(boolean scalePlayerToDisguise) {
if (!LibsPremium.isPremium() && !DisguiseConfig.isScaleSelfDisguises() && scalePlayerToDisguise) { if (!LibsPremium.isPremium() && scalePlayerToDisguise) {
scalePlayerToDisguise = false; scalePlayerToDisguise = false;
LibsDisguises.getInstance().getLogger() LibsDisguises.getInstance().getLogger()
.info("You cannot use setScalePlayerToDisguise if it's disabled in the config without the Premium Plugin"); .info("You cannot use setScalePlayerToDisguise if it's disabled in the config without the Premium Plugin");
@ -640,12 +640,11 @@ public abstract class Disguise {
.orElse(null); .orElse(null);
// Disabled or not allowed or doesn't need to scale up // Disabled or not allowed or doesn't need to scale up
if (!isScalePlayerToDisguise() || !LibsPremium.isPremium() || !DisguiseConfig.isScaleSelfDisguises() || if (!isScalePlayerToDisguise() || !LibsPremium.isPremium() || personalPlayerScaleAttribute == 1 || isPlayerDisguise()) {
personalPlayerScaleAttribute == 1 || isPlayerDisguise()) {
if (modifier != null) { if (modifier != null) {
attribute.removeModifier(modifier); attribute.removeModifier(modifier);
} }
} else if (isScalePlayerToDisguise() && DisguiseConfig.isScaleSelfDisguises()) { } else if (isScalePlayerToDisguise()) {
personalPlayerScaleAttribute -= 1; personalPlayerScaleAttribute -= 1;
if (modifier != null) { if (modifier != null) {