Skip to content

Commit 955aa3a

Browse files
Fix incorrectly converting MCPL to Geyser holdersets (GeyserMC#5577)
1 parent efb52dc commit 955aa3a

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

core/src/main/java/org/geysermc/geyser/session/cache/tags/GeyserHolderSet.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
import java.util.List;
3939
import java.util.Objects;
40+
import java.util.Optional;
4041
import java.util.function.ToIntFunction;
4142

4243
/**
@@ -72,7 +73,8 @@ private GeyserHolderSet(JavaRegistryKey<T> registry, @Nullable Tag<T> tag, int @
7273
* Constructs a {@link GeyserHolderSet} from a MCPL HolderSet.
7374
*/
7475
public static <T> GeyserHolderSet<T> fromHolderSet(JavaRegistryKey<T> registry, @NonNull HolderSet holderSet) {
75-
return new GeyserHolderSet<>(registry, new Tag<>(registry, holderSet.getLocation()), holderSet.getHolders());
76+
Tag<T> tag = holderSet.getLocation() == null ? null : new Tag<>(registry, holderSet.getLocation());
77+
return new GeyserHolderSet<>(registry, tag, holderSet.getHolders());
7678
}
7779

7880
/**

0 commit comments

Comments
 (0)