no more NullPointerException pls

intmian · Apr 22, 2022 · cb043e0 · cb043e0
1 parent 1c6aa32
commit cb043e0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java b/src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java
@@ -705,12 +705,14 @@ public AvatarInfo toProto() {
 				.setExpLevel(10)
 				.setExpNumber(6325); // Highest Level
 
-		for (int i = 0; i < this.getFetterList().size(); i++) {
-			avatarFetter.addFetterList(
-				FetterData.newBuilder()
-					.setFetterId(this.getFetterList().get(i))
-					.setFetterState(FetterState.FINISH.getValue())
-			);
+		if (this.getFetterList() != null) {
+			for (int i = 0; i < this.getFetterList().size(); i++) {
+				avatarFetter.addFetterList(
+					FetterData.newBuilder()
+						.setFetterId(this.getFetterList().get(i))
+						.setFetterState(FetterState.FINISH.getValue())
+				);
+			}
 		}
 
 		AvatarInfo.Builder avatarInfo = AvatarInfo.newBuilder()