From d834895ff2987ff0d971613043d9e58f549b502f Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Thu, 14 Oct 2021 18:14:23 +0100
Subject: [PATCH] Fix null related issues in CFRObfuscationMapping

---
 .../loom/decompilers/cfr/CFRObfuscationMapping.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java b/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java
index 83afc21b..c8baa2a7 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java
@@ -180,17 +180,20 @@ public class CFRObfuscationMapping extends NullMapping {
 		public Dumper dumpFieldDoc(Field field, JavaTypeInstance owner) {
 			// None static fields in records are handled in the class javadoc.
 			if (isRecord(owner) && !isStatic(field)) {
-				return null;
+				return this;
 			}
 
 			MappingTree.ClassMapping classMapping = getClassMapping(owner);
 
 			if (classMapping == null) {
-				return null;
+				return this;
 			}
 
 			MappingTree.FieldMapping fieldMapping = classMapping.getField(field.getFieldName(), field.getDescriptor());
-			dumpComment(fieldMapping.getComment());
+
+			if (fieldMapping != null) {
+				dumpComment(fieldMapping.getComment());
+			}
 
 			return this;
 		}