Merge pull request #6212 from DM0000/ProtoBug#6211

added null check for lastUnitMember
MegaMek · Nov 23, 2024 · d602cee · d602cee
2 parents 2590e1e + 204c1f5
commit d602cee
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/megamek/src/megamek/server/totalwarfare/TWGameManager.java b/megamek/src/megamek/server/totalwarfare/TWGameManager.java
@@ -26989,9 +26989,11 @@ public boolean accept(Entity entity) {
                                         && (lastUnitNum == entity.getUnitNumber());
                             }
                         });
+                        if(lastUnit.next() != null){
                         Entity lastUnitMember = lastUnit.next();
                         lastUnitMember.setUnitNumber(deletedUnitNum);
                         entityUpdate(lastUnitMember.getId());
+                        }
                     } // End update-unit-number
                 } // End added-ProtoMek