Merge pull request #3471 from kwvanderlinde/bugfix/3254-grid-shape

Handle grids without a grid shape
RPTools · Jul 9, 2022 · 7fae5c5 · 7fae5c5
2 parents a8c4a5c + f28135c
commit 7fae5c5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/net/rptools/maptool/model/Grid.java b/src/main/java/net/rptools/maptool/model/Grid.java
@@ -937,7 +937,11 @@ public static Grid fromDto(GridDto dto) {
     grid.offsetX = dto.getOffsetX();
     grid.offsetY = dto.getOffsetY();
     grid.size = dto.getSize();
-    grid.cellShape = Mapper.map(dto.getCellShape());
+    if (dto.hasCellShape()) {
+      grid.cellShape = Mapper.map(dto.getCellShape());
+    } else {
+      grid.cellShape = null;
+    }
     return grid;
   }
 
@@ -949,7 +953,9 @@ public GridDto toDto() {
     dto.setOffsetX(offsetX);
     dto.setOffsetX(offsetY);
     dto.setSize(size);
-    dto.setCellShape(Mapper.map(cellShape));
+    if (cellShape != null) {
+      dto.setCellShape(Mapper.map(cellShape));
+    }
     return dto.build();
   }