Skip to content

Commit 5e4e3fe

Browse files
authored
Merge pull request #61 from TBoshoven/1.16-banner-crash
Remove usage of client-only method in code that is called by the server
2 parents f8ee515 + 01c45f7 commit 5e4e3fe

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/tileentities/modifiers/BannerMagicMirrorTileEntityModifier.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
import javax.annotation.Nullable;
2626
import javax.annotation.ParametersAreNonnullByDefault;
27+
import java.util.Arrays;
2728
import java.util.List;
29+
import java.util.Optional;
2830

2931

3032
@ParametersAreNonnullByDefault
@@ -107,10 +109,11 @@ public void activate(MagicMirrorBaseTileEntity tileEntity) {
107109
int size = patterns.size();
108110
for (int i = 0; i < size; ++i) {
109111
CompoundNBT pattern = patterns.getCompound(i);
110-
BannerPattern bannerPattern = BannerPattern.byHash(pattern.getString("Pattern"));
111-
if (bannerPattern != null) {
112+
String patternHash = pattern.getString("Pattern");
113+
Optional<BannerPattern> bannerPattern = Arrays.stream(BannerPattern.values()).filter(p -> p.getHashname().equals(patternHash)).findFirst();
114+
if (bannerPattern.isPresent()) {
112115
DyeColor bannerPatternColor = DyeColor.byId(pattern.getInt("Color"));
113-
patternList.add(Pair.of(bannerPattern, bannerPatternColor));
116+
patternList.add(Pair.of(bannerPattern.get(), bannerPatternColor));
114117
}
115118
}
116119
}

0 commit comments

Comments
 (0)