Merge remote-tracking branch 'upstream/master'

2020-04-14 01:49:04 +03:00
parent 5d542f49ef 7249ca4018
commit ac49c06f4b
14 changed files with 43 additions and 29 deletions
@@ -2605,7 +2605,8 @@ void RemoveDockingTile(TileIndex t)
 		if (!IsValidTile(tile)) continue;

 		if (IsTileType(tile, MP_STATION)) {
-			UpdateStationDockingTiles(Station::GetByTile(tile));
+			Station *st = Station::GetByTile(tile);
+			if (st != nullptr) UpdateStationDockingTiles(st);
 		} else if (IsTileType(tile, MP_INDUSTRY)) {
 			Station *neutral = Industry::GetByTile(tile)->neutral_station;
 			if (neutral != nullptr) UpdateStationDockingTiles(neutral);