From 98c4580db934b8639486a1b7e453f9f4cc9004ce Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Tue, 22 Dec 2020 14:48:22 +1000 Subject: [PATCH] Fix SideEffectSet.none() being the default set (#1620) * Fix SideEffectSet.none() being the default set * Remove the unnecessary private empty constructor for SideEffectSet * Back to ImmutableMap.of --- .../java/com/sk89q/worldedit/util/SideEffectSet.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java index 6626bc2fd5..ebf5f73329 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java @@ -30,19 +30,15 @@ import java.util.stream.Collectors; public class SideEffectSet { - private static final SideEffectSet DEFAULT = new SideEffectSet( - Arrays.stream(SideEffect.values()).collect(Collectors.toMap(Function.identity(), SideEffect::getDefaultValue)) + private static final SideEffectSet DEFAULT = new SideEffectSet(ImmutableMap.of()); + private static final SideEffectSet NONE = new SideEffectSet( + Arrays.stream(SideEffect.values()).collect(Collectors.toMap(Function.identity(), state -> SideEffect.State.OFF)) ); - private static final SideEffectSet NONE = new SideEffectSet(); private final Map sideEffects; private final Set appliedSideEffects; private final boolean appliesAny; - private SideEffectSet() { - this(ImmutableMap.of()); - } - public SideEffectSet(Map sideEffects) { this.sideEffects = Maps.immutableEnumMap(sideEffects);