#2097 Fix exception in youth player substitution

build.gradle

@@ -345,9 +345,9 @@ tasks.register("pushmd")  {
         // list the contributors that don't want to be mentioned in release notes
         def contributorFilter = ["Che"]
 
-        def commitCount = callGit('git rev-list 7.0..HEAD --count')
-        def diff = callGit('git diff --shortstat 7.0..HEAD')
-        def contributors = filter(callGit('git shortlog -s -n 7.0..HEAD'), contributorFilter)
+        def commitCount = callGit('git rev-list 8.0..HEAD --count')
+        def diff = callGit('git diff --shortstat 8.0..HEAD')
+        def contributors = filter(callGit('git shortlog -s -n 8.0..HEAD'), contributorFilter)
         def latestCommit = callGit('git log -1 --pretty=format:"%s"')
 
         println("create release-notes")

src/main/java/core/model/match/MatchLineupTeam.java

@@ -698,21 +698,21 @@ private void initMinutesOfPlayersInSectors() {
 	}
 
 	private void examineSubstitution(Substitution substitution) {
-		var leavingplayer = this.getPlayerByID(substitution.getSubjectPlayerID(),true);
-		if ( leavingplayer == null){
-			leavingplayer = new MatchLineupPosition(substitution.getRoleId(), substitution.getSubjectPlayerID(), substitution.getBehaviour());
+		var leavingPlayer = this.getPlayerByID(substitution.getSubjectPlayerID(),true);
+		if ( leavingPlayer == null){
+			leavingPlayer = new MatchLineupPosition(substitution.getRoleId(), substitution.getSubjectPlayerID(), substitution.getBehaviour());
 		}
 		switch (substitution.getOrderType()) {
 			case NEW_BEHAVIOUR -> {
-				removeMatchAppearance(leavingplayer, substitution.getMatchMinuteCriteria());
+				removeMatchAppearance(leavingPlayer, substitution.getMatchMinuteCriteria());
 				if ( substitution.getRoleId() > 0) {
-					lastMatchAppearances.put((int) substitution.getRoleId(), new MatchAppearance(leavingplayer, substitution.getMatchMinuteCriteria()));
+					lastMatchAppearances.put((int) substitution.getRoleId(), new MatchAppearance(leavingPlayer, substitution.getMatchMinuteCriteria()));
 				}
 			}
 			case SUBSTITUTION -> {
 				var setPiecesTaker = lastMatchAppearances.get(MatchRoleID.setPieces);
-				var leavingPlayerIsSetPiecesTaker = setPiecesTaker != null && setPiecesTaker.player == leavingplayer;
-				removeMatchAppearance(leavingplayer, substitution.getMatchMinuteCriteria());
+				var leavingPlayerIsSetPiecesTaker = setPiecesTaker != null && setPiecesTaker.player == leavingPlayer;
+				removeMatchAppearance(leavingPlayer, substitution.getMatchMinuteCriteria());
 				var enteringplayer = this.getPlayerByID(substitution.getObjectPlayerID(), true);
 				if ( enteringplayer == null){
 					enteringplayer = new MatchLineupPosition(substitution.getRoleId(), substitution.getObjectPlayerID(), substitution.getBehaviour());
@@ -731,27 +731,30 @@ private void examineSubstitution(Substitution substitution) {
 			}
 			case POSITION_SWAP -> {
 				var player = this.getPlayerByID(substitution.getObjectPlayerID(), true);
-				var leavingRole = removeMatchAppearance(leavingplayer, substitution.getMatchMinuteCriteria());
-				var playerRole = removeMatchAppearance(player, substitution.getMatchMinuteCriteria());
-				lastMatchAppearances.put(playerRole, new MatchAppearance(leavingplayer, substitution.getMatchMinuteCriteria()));
+				if ( player != null ){
+					var playerRole = removeMatchAppearance(player, substitution.getMatchMinuteCriteria());
+					lastMatchAppearances.put(playerRole, new MatchAppearance(leavingPlayer, substitution.getMatchMinuteCriteria()));
+				}
+				var leavingRole = removeMatchAppearance(leavingPlayer, substitution.getMatchMinuteCriteria());
 				lastMatchAppearances.put(leavingRole, new MatchAppearance(player, substitution.getMatchMinuteCriteria()));
 			}
 		}
 	}
 
-	private int removeMatchAppearance(MatchLineupPosition leavingplayer, int minute) {
+	private int removeMatchAppearance(MatchLineupPosition leavingPlayer, int minute) {
 		int ret = MatchRoleID.UNKNOWN;
-		var entries = lastMatchAppearances.entrySet().stream()
-				.filter(i -> i.getValue().getPlayerId() == leavingplayer.getPlayerId()).toList();
-		for (var entry : entries) {
-			var appearance = entry.getValue();
-			var role = entry.getKey();
-			if (role != MatchRoleID.setPieces) { // do not return set pieces taker role of leaving player
-				ret = role;
-			}
-			//leavingplayer.addMinutesInSector(minute-appearance.minute, role);
-			addPlayersMinutesInSector(leavingplayer.getPlayerId(), MatchRoleID.getSector(role), minute - appearance.minute);
-			lastMatchAppearances.remove(entry.getKey());
+		if (leavingPlayer != null) {
+			var entries = lastMatchAppearances.entrySet().stream()
+					.filter(i -> i.getValue().getPlayerId() == leavingPlayer.getPlayerId()).toList();
+			for (var entry : entries) {
+				var appearance = entry.getValue();
+				var role = entry.getKey();
+				if (role != MatchRoleID.setPieces) { // do not return set pieces taker role of leaving player
+					ret = role;
+				}
+				addPlayersMinutesInSector(leavingPlayer.getPlayerId(), MatchRoleID.getSector(role), minute - appearance.minute);
+				lastMatchAppearances.remove(entry.getKey());
+			}
 		}
 		return ret;
 	}

src/main/resources/release_notes.md

@@ -2,7 +2,7 @@
 
 ## Highlights
 * Bug fixes only 
-* 
+
 ## [Detailed Changelog](https://github.com/ho-dev/HattrickOrganizer/issues?q=milestone%3A8.1)
 
 ### Database
@@ -30,6 +30,7 @@
 
 ### Youth
 * Fix sql error when youth scout comment is too long for the database column (#2094)
+* Fix exception on examining youth player substitutions (#2097)
 
 ### Option setting