Skip to content

Commit

Permalink
Fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
hlysine committed Jul 18, 2024
1 parent 54ea102 commit 5b697a8
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ public int getRawBrightness(BlockPos blockPos, int amount) {
public int getBlockTint(@NotNull BlockPos pos, @NotNull ColorResolver resolver) {
ClientPacketListener connection = Minecraft.getInstance().getConnection();
if (connection == null)
return GrassColor.getDefaultColor();
return GrassColor.get(0.5, 1);
Biome plainsBiome = connection.registryAccess().registry(Registry.BIOME_REGISTRY).map(r -> r.get(Biomes.PLAINS)).orElse(null);
if (plainsBiome == null)
return GrassColor.getDefaultColor();
return GrassColor.get(0.5, 1);
return resolver.getColor(plainsBiome, pos.getX(), pos.getZ());
}
}

0 comments on commit 5b697a8

Please sign in to comment.