Skip to content

Commit b5fe430

Browse files
authored
Merge pull request #17 from ChiefArug/15-fix
Fix crashing due to providing a server side villager to a render function
2 parents 72263d2 + 3df95d2 commit b5fe430

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

common/src/main/java/com/mrbysco/justenoughprofessions/VillagerCache.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import com.mrbysco.justenoughprofessions.platform.Services;
44
import net.minecraft.client.Minecraft;
5+
import net.minecraft.client.multiplayer.ClientLevel;
56
import net.minecraft.nbt.CompoundTag;
67
import net.minecraft.world.entity.EntityType;
78
import net.minecraft.world.entity.npc.Villager;
89
import net.minecraft.world.entity.npc.VillagerProfession;
9-
import net.minecraft.world.level.Level;
1010
import org.jetbrains.annotations.Nullable;
1111

1212
import java.util.Objects;
@@ -20,8 +20,7 @@ public static Villager getVillagerEntity(VillagerProfession profession) {
2020
if (cachedVillager == null) {
2121
CompoundTag nbt = new CompoundTag();
2222
nbt.putString("id", Objects.requireNonNull(Services.PLATFORM.getEntityKey(EntityType.VILLAGER)).toString());
23-
Minecraft mc = Minecraft.getInstance();
24-
Level level = mc.hasSingleplayerServer() && mc.getSingleplayerServer() != null ? mc.getSingleplayerServer().getAllLevels().iterator().next() : mc.level;
23+
ClientLevel level = Minecraft.getInstance().level;
2524
if (level != null) {
2625
Villager villager = (Villager) EntityType.loadEntityRecursive(nbt, level, Function.identity());
2726
if (villager != null) {

0 commit comments

Comments
 (0)